diff options
| author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-09-22 15:22:19 +0800 |
|---|---|---|
| committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-09-22 15:22:19 +0800 |
| commit | 82921ff86b34a603bf76c0812b8f23d47f67084e (patch) | |
| tree | b8963a8839f4047a02278a062485853968989ef9 | |
| parent | 3be60a63c70f31b6d1b39726b4bb9ac5c9539480 (diff) | |
| download | marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar.gz marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar.bz2 marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar.lz marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar.xz marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.tar.zst marcuscom-ports-82921ff86b34a603bf76c0812b8f23d47f67084e.zip | |
Update glib to 2.40.1. Remove an already committed patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19906 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 5 | ||||
| -rw-r--r-- | devel/glib20/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gio_gunixmount.c | 11 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gobject_Makefile.in | 14 |
4 files changed, 9 insertions, 25 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 8a4b2d5a2..430265d2e 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,8 +3,7 @@ # $MCom$ PORTNAME= glib -PORTVERSION= 2.40.0 -PORTREVISION= 4 +PORTVERSION= 2.40.1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -41,7 +40,7 @@ INSTALL_TARGET= install-strip SHEBANG_FILES= */*.pl glib/gen-iswide-table.py -LIBVERSION= 0.4000.0 +LIBVERSION= 0.4001.0 PLIST_SUB+= LIBVERSION=${LIBVERSION} OPTIONS_DEFINE= COLLATION_FIX DEBUG GDB diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index f7385a578..96fa69c36 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.40.0.tar.xz) = 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 -SIZE (gnome2/glib-2.40.0.tar.xz) = 7016228 +SHA256 (gnome2/glib-2.40.1.tar.xz) = c6b67ea212e8d74ee0676f7b2539451fd74b057cf21bb5e0074714e3359066bf +SIZE (gnome2/glib-2.40.1.tar.xz) = 7002452 diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c index e0b3caa37..3e4df930a 100644 --- a/devel/glib20/files/patch-gio_gunixmount.c +++ b/devel/glib20/files/patch-gio_gunixmount.c @@ -1,6 +1,6 @@ ---- gio/gunixmount.c.orig 2011-08-31 19:47:35.000000000 +0200 -+++ gio/gunixmount.c 2011-09-15 17:50:24.000000000 +0200 -@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount * +--- gio/gunixmount.c.orig 2014-09-21 13:00:08.875162804 +0200 ++++ gio/gunixmount.c 2014-09-21 13:00:14.327163623 +0200 +@@ -353,12 +353,17 @@ gpointer user_data) { GUnixMount *unix_mount = G_UNIX_MOUNT (mount); @@ -12,9 +12,8 @@ else argv[1] = unix_mount->device_path; +#else -+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; -+ -+ argv[2] = unix_mount->device_path; ++ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; ++ argv[2] = unix_mount->device_path; +#endif eject_unmount_do (mount, cancellable, callback, user_data, argv); diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in deleted file mode 100644 index d12c065cd..000000000 --- a/devel/glib20/files/patch-gobject_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=707298 -https://git.gnome.org/browse/glib/commit/?h=glib-2-40&id=3662eb9759fe225d1c214db6927c667a1b733e8a - ---- gobject/Makefile.in.orig 2014-06-01 21:22:14.000000000 +0200 -+++ gobject/Makefile.in 2014-06-01 21:22:48.000000000 +0200 -@@ -869,7 +869,7 @@ - @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res = gobject-win32-res.o - @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res) - libgobjectincludedir = $(includedir)/glib-2.0/gobject --libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ -+libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) -Wl,-z,nodelete \ - $(gobject_win32_res_ldflag) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic $(no_undefined) |