summaryrefslogtreecommitdiff
path: root/devel/glib20
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib20')
-rw-r--r--devel/glib20/Makefile7
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-ae37
-rw-r--r--devel/glib20/files/patch-gio_gunixvolume.c10
-rw-r--r--devel/glib20/pkg-plist24
5 files changed, 54 insertions, 30 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index da8461a0fe8d..116d8e44e3b6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.166 2010/05/04 09:44:51 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.22.4
+PORTVERSION= 2.24.1
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -73,6 +73,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/glib/gutils.c
+post-install:
+ -${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+
.include <bsd.port.post.mk>
.endif
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index c53a132c2daf..3a080dc7dc69 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708
-SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
-SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207
+MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2
+SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 4699afdbedd4..a6d6851b09cf 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,28 +1,25 @@
---- configure.orig 2009-09-05 10:54:38.000000000 +0200
-+++ configure 2009-09-05 10:56:40.000000000 +0200
-@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
+--- configure.orig 2010-03-03 21:31:46.000000000 -0500
++++ configure 2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
++# include <sys/param.h>
+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
- int
- main ()
- {
-@@ -31611,7 +31617,7 @@ done
-
-
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ fi
+ done
-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39943,6 +39949,8 @@ fi
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -25631,6 +25634,8 @@ fi
;;
esac
fi
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index 377a7d6b5686..b22563047d84 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,6 +1,6 @@
---- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500
-+++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500
-@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume,
+--- gio/gunixvolume.c.orig 2009-11-30 04:35:27.000000000 +0100
++++ gio/gunixvolume.c 2009-12-08 19:32:03.000000000 +0100
+@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume
gpointer user_data)
{
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
@@ -8,8 +8,8 @@
+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
+ argv[2] = unix_volume->device_path;
+#else
- char *argv[] = {"eject", NULL, NULL};
--
+ char *argv[] = { "eject", NULL, NULL };
+
argv[1] = unix_volume->device_path;
+#endif
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 4e011916cd1a..a760ba254490 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,3 +1,4 @@
+bin/gio-querymodules
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@@ -5,7 +6,9 @@ bin/gobject-query
bin/gtester
bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
@@ -17,7 +20,11 @@ include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcharsetconverter.h
include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gconverter.h
+include/glib-2.0/gio/gconverterinputstream.h
+include/glib-2.0/gio/gconverteroutputstream.h
include/glib-2.0/gio/gdatainputstream.h
include/glib-2.0/gio/gdataoutputstream.h
include/glib-2.0/gio/gdrive.h
@@ -76,6 +83,8 @@ include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
+include/glib-2.0/gio/gzlibcompressor.h
+include/glib-2.0/gio/gzlibdecompressor.h
include/glib-2.0/glib-object.h
include/glib-2.0/glib.h
include/glib-2.0/glib/galloca.h
@@ -84,6 +93,7 @@ include/glib-2.0/glib/gasyncqueue.h
include/glib-2.0/glib/gatomic.h
include/glib-2.0/glib/gbacktrace.h
include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbitlock.h
include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
include/glib-2.0/glib/gchecksum.h
@@ -138,6 +148,8 @@ include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/gvariant.h
+include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/glibconfig.h
include/glib-2.0/gmodule.h
@@ -190,9 +202,11 @@ share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/Makefile.in.in
+share/locale/af/LC_MESSAGES/glib20.mo
share/locale/am/LC_MESSAGES/glib20.mo
share/locale/ar/LC_MESSAGES/glib20.mo
share/locale/as/LC_MESSAGES/glib20.mo
+share/locale/ast/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -210,6 +224,7 @@ share/locale/dz/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
share/locale/en_CA/LC_MESSAGES/glib20.mo
share/locale/en_GB/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
share/locale/eo/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/et/LC_MESSAGES/glib20.mo
@@ -243,6 +258,7 @@ share/locale/mn/LC_MESSAGES/glib20.mo
share/locale/mr/LC_MESSAGES/glib20.mo
share/locale/ms/LC_MESSAGES/glib20.mo
share/locale/nb/LC_MESSAGES/glib20.mo
+share/locale/nds/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
@@ -282,6 +298,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
@exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
@dirrmtry lib/gio/modules
@dirrmtry lib/gio
@dirrm include/glib-2.0/gobject
@@ -314,6 +332,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -324,6 +344,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -332,5 +354,7 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 14:39:46 +0000