[141204] trunk/dports/devel
ryandesign at macports.org
ryandesign at macports.org
Mon Oct 12 13:02:51 PDT 2015
Revision: 141204
https://trac.macports.org/changeset/141204
Author: ryandesign at macports.org
Date: 2015-10-12 13:02:50 -0700 (Mon, 12 Oct 2015)
Log Message:
-----------
glib2, glib2-devel: fix building on OS X 10.8 and earlier when building universal (#49151) or when autoconf/automake/libtool are not installed (#49221); revbump to ensure our post-configure editing of the config.h file has not been subverted on those systems where it did build
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
Added Paths:
-----------
trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch
trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend-unused.patch
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2015-10-12 19:57:48 UTC (rev 141203)
+++ trunk/dports/devel/glib2/Portfile 2015-10-12 20:02:50 UTC (rev 141204)
@@ -11,6 +11,7 @@
conflicts glib2-devel
set my_name glib
version 2.46.0
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -103,7 +104,7 @@
test.target check
post-destroot {
- file delete ${destroot}${prefix}/lib/charset.alias
+ delete ${destroot}${prefix}/lib/charset.alias
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
Added: trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch
===================================================================
--- trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch (rev 0)
+++ trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend-unused.patch 2015-10-12 20:02:50 UTC (rev 141204)
@@ -0,0 +1,47 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+These patches to configure.ac and gio/Makefile.am are not used by the port but are
+used by the maintainer to regenerate the patches to configure and gio/Makefile.in
+that are used by the port.
+--- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
++++ configure.ac 2015-10-10 18:32:37.000000000 -0500
+@@ -223,15 +223,6 @@
+ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- AC_MSG_CHECKING([OSX version >= $osx_min_version])
+- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([OSX version is too old!])
+- ])
+- AC_MSG_RESULT([yes])
+ ], [COCOA_LIBS=""])
+
+ AC_SUBST([COCOA_LIBS])
+--- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
++++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
+@@ -265,9 +265,6 @@
+ ggtknotificationbackend.c \
+ $(NULL)
+
+-if OS_COCOA
+-unix_sources += gcocoanotificationbackend.c
+-endif
+
+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+@@ -527,7 +524,7 @@
+ if OS_COCOA
+ # This is dumb. The ObjC source file should be properly named .m
+ libgio_2_0_la_CFLAGS += -xobjective-c
+-libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
++libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
+ endif
+
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
Modified: trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch
===================================================================
--- trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch 2015-10-12 19:57:48 UTC (rev 141203)
+++ trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch 2015-10-12 20:02:50 UTC (rev 141204)
@@ -36,45 +36,6 @@
else
COCOA_LIBS=""
fi
---- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
-+++ configure.ac 2015-10-10 18:32:37.000000000 -0500
-@@ -223,15 +223,6 @@
- AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
- COCOA_LIBS="-Wl,-framework,Foundation"
- LDFLAGS="$LDFLAGS $COCOA_LIBS"
--
-- osx_version=`sw_vers -productVersion`
-- osx_min_version="10.9.0"
-- AC_MSG_CHECKING([OSX version >= $osx_min_version])
-- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([OSX version is too old!])
-- ])
-- AC_MSG_RESULT([yes])
- ], [COCOA_LIBS=""])
-
- AC_SUBST([COCOA_LIBS])
---- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
-+++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
-@@ -265,9 +265,6 @@
- ggtknotificationbackend.c \
- $(NULL)
-
--if OS_COCOA
--unix_sources += gcocoanotificationbackend.c
--endif
-
- giounixincludedir=$(includedir)/gio-unix-2.0/gio
- giounixinclude_HEADERS = \
-@@ -527,7 +524,7 @@
- if OS_COCOA
- # This is dumb. The ObjC source file should be properly named .m
- libgio_2_0_la_CFLAGS += -xobjective-c
--libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
-+libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
- endif
-
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
--- gio/Makefile.in.orig 2015-09-21 07:39:06.000000000 -0500
+++ gio/Makefile.in 2015-10-10 18:33:18.000000000 -0500
@@ -181,27 +181,26 @@
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2015-10-12 19:57:48 UTC (rev 141203)
+++ trunk/dports/devel/glib2-devel/Portfile 2015-10-12 20:02:50 UTC (rev 141204)
@@ -11,6 +11,7 @@
conflicts glib2
set my_name glib
version 2.46.0
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -103,7 +104,7 @@
test.target check
post-destroot {
- file delete ${destroot}${prefix}/lib/charset.alias
+ delete ${destroot}${prefix}/lib/charset.alias
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
Added: trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend-unused.patch
===================================================================
--- trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend-unused.patch (rev 0)
+++ trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend-unused.patch 2015-10-12 20:02:50 UTC (rev 141204)
@@ -0,0 +1,47 @@
+Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
+Reverts:
+https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
+And most of:
+https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
+These patches to configure.ac and gio/Makefile.am are not used by the port but are
+used by the maintainer to regenerate the patches to configure and gio/Makefile.in
+that are used by the port.
+--- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
++++ configure.ac 2015-10-10 18:32:37.000000000 -0500
+@@ -223,15 +223,6 @@
+ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+ COCOA_LIBS="-Wl,-framework,Foundation"
+ LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-
+- osx_version=`sw_vers -productVersion`
+- osx_min_version="10.9.0"
+- AC_MSG_CHECKING([OSX version >= $osx_min_version])
+- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([OSX version is too old!])
+- ])
+- AC_MSG_RESULT([yes])
+ ], [COCOA_LIBS=""])
+
+ AC_SUBST([COCOA_LIBS])
+--- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
++++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
+@@ -265,9 +265,6 @@
+ ggtknotificationbackend.c \
+ $(NULL)
+
+-if OS_COCOA
+-unix_sources += gcocoanotificationbackend.c
+-endif
+
+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+@@ -527,7 +524,7 @@
+ if OS_COCOA
+ # This is dumb. The ObjC source file should be properly named .m
+ libgio_2_0_la_CFLAGS += -xobjective-c
+-libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
++libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
+ endif
+
+ libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
Modified: trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch
===================================================================
--- trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2015-10-12 19:57:48 UTC (rev 141203)
+++ trunk/dports/devel/glib2-devel/files/remove-gcocoanotificationbackend.patch 2015-10-12 20:02:50 UTC (rev 141204)
@@ -36,45 +36,6 @@
else
COCOA_LIBS=""
fi
---- configure.ac.orig 2015-09-21 07:38:33.000000000 -0500
-+++ configure.ac 2015-10-10 18:32:37.000000000 -0500
-@@ -223,15 +223,6 @@
- AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
- COCOA_LIBS="-Wl,-framework,Foundation"
- LDFLAGS="$LDFLAGS $COCOA_LIBS"
--
-- osx_version=`sw_vers -productVersion`
-- osx_min_version="10.9.0"
-- AC_MSG_CHECKING([OSX version >= $osx_min_version])
-- AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([OSX version is too old!])
-- ])
-- AC_MSG_RESULT([yes])
- ], [COCOA_LIBS=""])
-
- AC_SUBST([COCOA_LIBS])
---- gio/Makefile.am.orig 2015-09-04 12:56:56.000000000 -0500
-+++ gio/Makefile.am 2015-10-10 18:32:38.000000000 -0500
-@@ -265,9 +265,6 @@
- ggtknotificationbackend.c \
- $(NULL)
-
--if OS_COCOA
--unix_sources += gcocoanotificationbackend.c
--endif
-
- giounixincludedir=$(includedir)/gio-unix-2.0/gio
- giounixinclude_HEADERS = \
-@@ -527,7 +524,7 @@
- if OS_COCOA
- # This is dumb. The ObjC source file should be properly named .m
- libgio_2_0_la_CFLAGS += -xobjective-c
--libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,AppKit
-+libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
- endif
-
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
--- gio/Makefile.in.orig 2015-09-21 07:39:06.000000000 -0500
+++ gio/Makefile.in 2015-10-10 18:33:18.000000000 -0500
@@ -181,27 +181,26 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151012/acbb7b1d/attachment.html>
More information about the macports-changes
mailing list