logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

redshift-1.12_no_objc.patch (2803B)

    

  1. diff -udr ./configure.ac ../redshift-1.12.new/configure.ac
  2. --- ./configure.ac	2018-05-21 01:47:53.000000000 +0000
  3. +++ ./configure.ac	2020-04-04 08:00:02.853123881 +0000
  4. @@ -13,7 +13,6 @@
  5.  # Checks for programs.
  6.  AC_PROG_CC_C99
  7.  AC_PROG_LIBTOOL
  8. -AC_PROG_OBJC # For macOS support modules
  9.  AC_LANG([C])
  10.  
  11.  AC_PROG_INTLTOOL([0.50])
  12. @@ -39,18 +38,6 @@
  13.  	[test "x$enable_windows_resource" = xyes])
  14.  
  15.  
  16. -# Test whether Objective C compiler works
  17. -AC_MSG_CHECKING([whether Objective C compiler works])
  18. -AC_LANG_PUSH([Objective C])
  19. -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [
  20. -	AC_MSG_RESULT([yes])
  21. -	have_objc_compiler=yes
  22. -], [
  23. -	AC_MSG_RESULT([no])
  24. -	have_objc_compiler=no
  25. -])
  26. -AC_LANG_POP([Objective C])
  27. -
  28.  # Checks for libraries.
  29.  AM_GNU_GETTEXT_VERSION([0.17])
  30.  AM_GNU_GETTEXT([external])
  31. @@ -74,25 +61,7 @@
  32.  # macOS headers
  33.  AC_CHECK_HEADER([ApplicationServices/ApplicationServices.h], [have_appserv_h=yes], [have_appserv_h=no])
  34.  
  35. -# CoreLocation.h is an Objective C header. Only test if
  36. -# Objective C compiler works. AC_CHECK_HEADER does not
  37. -# appear to work if the Ojective C compiler is not
  38. -# available so we need a custom test.
  39. -AC_MSG_CHECKING([whether CoreLocation/CoreLocation.h is usable])
  40. -AS_IF([test "x$have_objc_compiler" = xyes], [
  41. -	AC_LANG_PUSH([Objective C])
  42. -	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#import <CoreLocation/CoreLocation.h>]],[[]])], [
  43. -		AC_MSG_RESULT([yes])
  44. -		have_corelocation_h=yes
  45. -	], [
  46. -		AC_MSG_RESULT([no])
  47. -		have_corelocation_h=no
  48. -	])
  49. -	AC_LANG_POP([Objective C])
  50. -], [
  51. -	AC_MSG_RESULT([no Objective C compiler available])
  52. -	have_corelocation_h=no
  53. -])
  54. +have_corelocation_h=no
  55.  
  56.  # Windows header
  57.  AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no])
  58. diff -udr ./src/Makefile.am ../redshift-1.12.new/src/Makefile.am
  59. --- ./src/Makefile.am	2018-05-21 01:47:53.000000000 +0000
  60. +++ ./src/Makefile.am	2020-04-04 08:00:03.109117287 +0000
  61. @@ -28,7 +28,6 @@
  62.  	gamma-quartz.c gamma-quartz.h \
  63.  	gamma-w32gdi.c gamma-w32gdi.h \
  64.  	location-geoclue2.c location-geoclue2.h \
  65. -	location-corelocation.m location-corelocation.h \
  66.  	windows/appicon.rc \
  67.  	windows/versioninfo.rc
  68.  
  69. @@ -80,22 +79,6 @@
  70.  	$(GEOCLUE2_LIBS) $(GEOCLUE2_CFLAGS)
  71.  endif
  72.  
  73. -# Build CoreLocation module as a separate convenience
  74. -# library since it is using a separate compiler
  75. -# (Objective C).
  76. -
  77. -if ENABLE_CORELOCATION
  78. -noinst_LTLIBRARIES = liblocation-corelocation.la
  79. -liblocation_corelocation_la_SOURCES = \
  80. -	location-corelocation.m location-corelocation.h
  81. -liblocation_corelocation_la_OBJCFLAGS = \
  82. -	$(CORELOCATION_CFLAGS)
  83. -liblocation_corelocation_la_LIBADD = \
  84. -	$(CORELOCATION_CFLAGS) $(CORELOCATION_LIBS)
  85. -redshift_LDADD += liblocation-corelocation.la
  86. -endif
  87. -
  88. -
  89.  # Windows resources
  90.  if ENABLE_WINDOWS_RESOURCE
  91.  redshift_SOURCES += windows/appicon.rc windows/versioninfo.rc