July 2013 - crux-commits

ports/opt (3.0): git: 1.8.3.1 -> 1.8.3.2
by crux＠crux.nu 06 Jul '13

06 Jul '13

commit a192b7f7d8ab809595a180aaff2019d83edd36cf Author: Thomas Penteker <tek(a)serverop.de> Date: Sat Jul 6 20:06:47 2013 +0200 git: 1.8.3.1 -> 1.8.3.2 diff --git a/git/.footprint b/git/.footprint index f3bd2a3..de70265 100644 --- a/git/.footprint +++ b/git/.footprint @@ -435,7 +435,7 @@ drwxr-xr-x root/root usr/share/git-core/templates/hooks/ -rwxr-xr-x root/root usr/share/git-core/templates/hooks/post-update.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-applypatch.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-commit.sample --rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-push.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-push.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-rebase.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/prepare-commit-msg.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/update.sample diff --git a/git/.md5sum b/git/.md5sum index 2c73eef..432ab70 100644 --- a/git/.md5sum +++ b/git/.md5sum @@ -1,2 +1,2 @@ -35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz -3f801cc82a58c2c2ceeab95975114113 git-manpages-1.8.3.1.tar.gz +83b792fd06066c77e1d4911ebba2d701 git-1.8.3.2.tar.gz +f850829e1e7f32e388d2ffb61759fcc9 git-manpages-1.8.3.2.tar.gz diff --git a/git/Pkgfile b/git/Pkgfile index c085d72..02fe8cf 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: tk name=git -version=1.8.3.1 +version=1.8.3.2 release=1 source=(https://git-core.googlecode.com/files/$name-{,manpages-}$version.ta…

1 0

ports/opt (3.0): libgpg-error: 1.11 -> 1.12
by crux＠crux.nu 06 Jul '13

06 Jul '13

commit 28318e525d27b5b88d1b945eddfe55ba4c47c77c Author: Thomas Penteker <tek(a)serverop.de> Date: Sat Jul 6 20:06:08 2013 +0200 libgpg-error: 1.11 -> 1.12 diff --git a/libgpg-error/.footprint b/libgpg-error/.footprint index 0542402..19ca8a6 100644 --- a/libgpg-error/.footprint +++ b/libgpg-error/.footprint @@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libgpg-error.a -rwxr-xr-x root/root usr/lib/libgpg-error.la -lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.9.0 -lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.9.0 --rwxr-xr-x root/root usr/lib/libgpg-error.so.0.9.0 +lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.10.0 +lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.10.0 +-rwxr-xr-x root/root usr/lib/libgpg-error.so.0.10.0 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gpg-error.m4 diff --git a/libgpg-error/.md5sum b/libgpg-error/.md5sum index 8ca7ad0..7dbf02b 100644 --- a/libgpg-error/.md5sum +++ b/libgpg-error/.md5sum @@ -1 +1 @@ -b9fa55b71cae73cb2e44254c2acc4e2c libgpg-error-1.11.tar.bz2 +8f0eb41a344d19ac2aa9bd101dfb9ce6 libgpg-error-1.12.tar.bz2 diff --git a/libgpg-error/Pkgfile b/libgpg-error/Pkgfile index 4fc5ea8..5895815 100644 --- a/libgpg-error/Pkgfile +++ b/libgpg-error/Pkgfile @@ -4,7 +4,7 @@ # Packager: Matt Housh, jaeger at morpheus dot net name=libgpg-error -version=1.11 +version=1.12 release=1 source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/$name-$version.tar.bz2)

1 0

ports/opt (3.0): xterm: updated to 294
by crux＠crux.nu 06 Jul '13

06 Jul '13

commit a8ae9c85259737c0cc112e3881de820e0476cab8 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Sat Jul 6 11:23:06 2013 +0200 xterm: updated to 294 diff --git a/xterm/.md5sum b/xterm/.md5sum index 862005b..d4ad9ab 100644 --- a/xterm/.md5sum +++ b/xterm/.md5sum @@ -1,2 +1,2 @@ 2bc971a1753fe57aca05fde7c005a16c configure.diff -f9dc37486d5f1e550b6dc2e26a8a0439 xterm-293.tgz +9e62f812f0560e446f9d0908662677f9 xterm-294.tgz diff --git a/xterm/Pkgfile b/xterm/Pkgfile index cd31f17..a0b4505 100644 --- a/xterm/Pkgfile +++ b/xterm/Pkgfile @@ -5,7 +5,7 @@ # Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc name=xterm -version=293 +version=294 release=1 source=(ftp://invisible-island.net/$name/$name-$version.tgz \ configure.diff)

1 0

ports/core (3.0): kmod: updated to version 14
by crux＠crux.nu 05 Jul '13

05 Jul '13

commit 3b9bfae6141265a80e080127ea2bc421c4b71f3a Author: Matt Housh <jaeger(a)morpheus.net> Date: Fri Jul 5 07:47:40 2013 -0500 kmod: updated to version 14 diff --git a/kmod/.footprint b/kmod/.footprint index 40c277c..d41b8e6 100644 --- a/kmod/.footprint +++ b/kmod/.footprint @@ -4,8 +4,8 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/depmod.d/ drwxr-xr-x root/root etc/modprobe.d/ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libkmod.so.2 -> libkmod.so.2.2.3 --rwxr-xr-x root/root lib/libkmod.so.2.2.3 +lrwxrwxrwx root/root lib/libkmod.so.2 -> libkmod.so.2.2.4 +-rwxr-xr-x root/root lib/libkmod.so.2.2.4 drwxr-xr-x root/root sbin/ lrwxrwxrwx root/root sbin/depmod -> kmod lrwxrwxrwx root/root sbin/insmod -> kmod @@ -19,7 +19,7 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libkmod.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libkmod.la -lrwxrwxrwx root/root usr/lib/libkmod.so -> ../../lib/libkmod.so.2.2.3 +lrwxrwxrwx root/root usr/lib/libkmod.so -> ../../lib/libkmod.so.2.2.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libkmod.pc drwxr-xr-x root/root usr/man/ diff --git a/kmod/.md5sum b/kmod/.md5sum index 670faef..0530553 100644 --- a/kmod/.md5sum +++ b/kmod/.md5sum @@ -1 +1 @@ -d5aba43b9370cd52f3cb35e82a1aa595 kmod-13.tar.xz +38009d0d6f10678a3ec22ccd29210d13 kmod-14.tar.xz diff --git a/kmod/Pkgfile b/kmod/Pkgfile index f72c7db..a56da11 100644 --- a/kmod/Pkgfile +++ b/kmod/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=kmod -version=13 +version=14 release=1 source=(https://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.…

1 0

ports/core (3.0): man-pages: updated to 3.52
by crux＠crux.nu 05 Jul '13

05 Jul '13

commit ec58317132ef231c06bbe7dfb03a4c3cce538ea0 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Jul 5 10:16:23 2013 +0200 man-pages: updated to 3.52 diff --git a/man-pages/.md5sum b/man-pages/.md5sum index c0220ef..4e94499 100644 --- a/man-pages/.md5sum +++ b/man-pages/.md5sum @@ -1,2 +1,2 @@ -63eef7d6d5abf30bc5b785e344d1df8b man-pages-3.51.tar.xz +dbf00e3a6fd1e23e27a4552bf4d16fed man-pages-3.52.tar.xz ec0a97ccb2ff9e4c32fac67111dbc99a man-pages-posix-2003-a.tar.xz diff --git a/man-pages/Pkgfile b/man-pages/Pkgfile index e261c04..d63e3bc 100644 --- a/man-pages/Pkgfile +++ b/man-pages/Pkgfile @@ -4,7 +4,7 @@ # Depends on: man name=man-pages -version=3.51 +version=3.52 release=1 source=(http://www.kernel.org/pub/linux/docs/$name/$name-$version.tar.xz \ http://www.kernel.org/pub/linux/docs/$name/$name-posix/$name-posix-2003-a.t…)

1 0

ports/xorg (3.0): [notify] xorg-libxi: 1.7.1 -> 1.7.2, Fixes CVE-2013-1998, CVE-2013-1984 and CVE-2013-1995
by crux＠crux.nu 03 Jul '13

03 Jul '13

commit cd4c325288b994487eef68d06cdc0d9a4e00cf73 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jul 3 19:42:50 2013 +1000 [notify] xorg-libxi: 1.7.1 -> 1.7.2, Fixes CVE-2013-1998, CVE-2013-1984 and CVE-2013-1995 diff --git a/xorg-libxi/.md5sum b/xorg-libxi/.md5sum index d6adad4..c7c5acf 100644 --- a/xorg-libxi/.md5sum +++ b/xorg-libxi/.md5sum @@ -1 +1 @@ -24d71afed1b86c60d4eb361628d7f47b libXi-1.7.1.tar.bz2 +f4df3532b1af1dcc905d804f55b30b4a libXi-1.7.2.tar.bz2 diff --git a/xorg-libxi/Pkgfile b/xorg-libxi/Pkgfile index 2e80031..235a3ab 100644 --- a/xorg-libxi/Pkgfile +++ b/xorg-libxi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-xproto, xorg-libx11, xorg-xextproto, xorg-libxext, xorg-inputproto, xorg-libxfixes name=xorg-libxi -version=1.7.1 +version=1.7.2 release=1 source=(http://xorg.freedesktop.org/releases/individual/lib/libXi-$version.…

1 0

ports/xorg (3.0): libdrm: 2.4.45 -> 2.4.46
by crux＠crux.nu 03 Jul '13

03 Jul '13

commit 75e6950d623d96f82135b57d22cfb2f917fe544a Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jul 3 19:37:41 2013 +1000 libdrm: 2.4.45 -> 2.4.46 diff --git a/libdrm/.md5sum b/libdrm/.md5sum index 4ce37be..5073ef9 100644 --- a/libdrm/.md5sum +++ b/libdrm/.md5sum @@ -1 +1 @@ -92ce56e7533a9b2fcb5c8f32d305328b libdrm-2.4.45.tar.bz2 +9cba217fd3daa10b1d052ec60d3aa7d5 libdrm-2.4.46.tar.bz2 diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile index 8a289e0..be4c047 100644 --- a/libdrm/Pkgfile +++ b/libdrm/Pkgfile @@ -4,8 +4,8 @@ # Depends on: libpthread-stubs xorg-libpciaccess name=libdrm -version=2.4.45 -release=2 +version=2.4.46 +release=1 source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2) build() {

1 0

ports/xorg (3.0): mesa3d: 9.1.3 -> 9.1.4
by crux＠crux.nu 03 Jul '13

03 Jul '13

commit c6f4f442d71f30e9de85cfb78b4b11c585262dbf Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Jul 3 12:21:40 2013 +1000 mesa3d: 9.1.3 -> 9.1.4 diff --git a/mesa3d/.footprint b/mesa3d/.footprint index 0b42a5f..18a5d5e 100644 --- a/mesa3d/.footprint +++ b/mesa3d/.footprint @@ -49,10 +49,10 @@ lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0.0 lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1.2.0 lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.2.0 -rwxr-xr-x root/root usr/lib/libGL.so.1.2.0 --rwxr-xr-x root/root usr/lib/libdricore9.1.3.la -lrwxrwxrwx root/root usr/lib/libdricore9.1.3.so -> libdricore9.1.3.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libdricore9.1.3.so.1 -> libdricore9.1.3.so.1.0.0 --rwxr-xr-x root/root usr/lib/libdricore9.1.3.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libdricore9.1.4.la +lrwxrwxrwx root/root usr/lib/libdricore9.1.4.so -> libdricore9.1.4.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libdricore9.1.4.so.1 -> libdricore9.1.4.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libdricore9.1.4.so.1.0.0 -rwxr-xr-x root/root usr/lib/libglapi.la lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.0.0.0 lrwxrwxrwx root/root usr/lib/libglapi.so.0 -> libglapi.so.0.0.0 diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index 0a8f21b..9f8dd23 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1 +1 @@ -952ccd03547ed72333b64e1746cf8ada MesaLib-9.1.3.tar.bz2 +a2c4e25d0e27918bc67f61bae04d0cb8 MesaLib-9.1.4.tar.bz2 diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 1d4ba99..e244d99 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python name=mesa3d -version=9.1.3 +version=9.1.4 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz…

1 0

ports/opt (3.0): libunique: fixed build issues and switched to bacon as default backend
by crux＠crux.nu 02 Jul '13

02 Jul '13

commit 2458906db8ae24850d102f26926f297cc6d8822d Author: Jose V Beneyto <sepen(a)crux.nu> Date: Tue Jul 2 19:11:16 2013 +0200 libunique: fixed build issues and switched to bacon as default backend diff --git a/libunique/.md5sum b/libunique/.md5sum index aa0ec97..7dfa89b 100644 --- a/libunique/.md5sum +++ b/libunique/.md5sum @@ -1,2 +1,2 @@ +0ebc031bd35a550fbc440d1bc4a19c5e G_CONST_RETURN.patch 7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 -2a4ad2c73caabee7ed2d943653d76eaa libunique.patch diff --git a/libunique/G_CONST_RETURN.patch b/libunique/G_CONST_RETURN.patch new file mode 100644 index 0000000..f3bb297 --- /dev/null +++ b/libunique/G_CONST_RETURN.patch @@ -0,0 +1,118 @@ +diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c +--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000 +@@ -781,7 +781,7 @@ + } + + +-G_CONST_RETURN gchar * ++const gchar * + unique_command_to_string (UniqueApp *app, + gint command) + { +@@ -863,7 +863,7 @@ + return retval; + } + +-G_CONST_RETURN gchar * ++const gchar * + unique_response_to_string (UniqueResponse response) + { + GEnumClass *enum_class; +diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c +--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950 +0000 +@@ -111,7 +111,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_name (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +@@ -154,7 +154,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_startup_id (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h +--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492 +0000 +@@ -94,10 +94,10 @@ + + UniqueBackend * unique_backend_create (void); + +-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); ++const gchar *unique_backend_get_name (UniqueBackend *backend); + void unique_backend_set_name (UniqueBackend *backend, + const gchar *name); +-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); ++const gchar *unique_backend_get_startup_id (UniqueBackend *backend); + void unique_backend_set_startup_id (UniqueBackend *backend, + const gchar *startup_id); + GdkScreen * unique_backend_get_screen (UniqueBackend *backend); +diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h +--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914 +0000 +@@ -44,11 +44,11 @@ + * and then back into an id + */ + UniqueResponse unique_response_from_string (const gchar *response); +-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); ++const gchar *unique_response_to_string (UniqueResponse response); + + gint unique_command_from_string (UniqueApp *app, + const gchar *command); +-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, ++const gchar *unique_command_to_string (UniqueApp *app, + gint command); + + G_END_DECLS +diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c +--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713 +0000 +@@ -185,7 +185,7 @@ + * + * Since: 1.0.2 + */ +-G_CONST_RETURN guchar * ++const guchar * + unique_message_data_get (UniqueMessageData *message_data, + gsize *length) + { +@@ -525,7 +525,7 @@ + * owned by the #UniqueMessageData structure and should not be + * modified or freed + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_message_data_get_startup_id (UniqueMessageData *message_data) + { + g_return_val_if_fail (message_data != NULL, NULL); +diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h +--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01 07:38:17.748122298 +0000 ++++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565 +0000 +@@ -48,7 +48,7 @@ + void unique_message_data_set (UniqueMessageData *message_data, + const guchar *data, + gsize length); +-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, ++const guchar *unique_message_data_get (UniqueMessageData *message_data, + gsize *length); + + gboolean unique_message_data_set_text (UniqueMessageData *message_data, +@@ -63,7 +63,7 @@ + gchar * unique_message_data_get_filename (UniqueMessageData *message_data); + + GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); +-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); ++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); + guint unique_message_data_get_workspace (UniqueMessageData *message_data); + + G_END_DECLS + diff --git a/libunique/Pkgfile b/libunique/Pkgfile index 213bbfa..bae0a5d 100644 --- a/libunique/Pkgfile +++ b/libunique/Pkgfile @@ -6,27 +6,27 @@ name=libunique version=1.1.6 -release=3 +release=4 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$versio… \ - $name.patch) + G_CONST_RETURN.patch) build() { cd $name-$version - patch -p1 -i $SRC/$name.patch - - # fix for automake >= 1.13 - sed -i configure.ac \ - -e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ - -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' - - autoreconf + patch -p1 -i $SRC/G_CONST_RETURN.patch ./configure --prefix=/usr \ --disable-dbus \ --disable-static \ + --disable-debug \ --with-x + + sed -i $(find . -type f -name Makefile) \ + -e 's|aclocal-1.11|aclocal|g' \ + -e 's|automake-1.11|automake|g' + make make DESTDIR=$PKG install + rm -rf $PKG/usr/share/gtk-doc } diff --git a/libunique/libunique.patch b/libunique/libunique.patch deleted file mode 100644 index 6a6a93f..0000000 --- a/libunique/libunique.patch +++ /dev/null @@ -1,646 +0,0 @@ -From 01066039529c0181f231325476bb4823c16a2aea Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe(a)gnome.org> -Date: Sat, 15 May 2010 17:47:45 +0000 -Subject: Add GDBus backend - -Add backend using GDBus, the new D-BUS binding in GIO 2.25. - -Bug #618723. ---- -diff --git a/configure.ac b/configure.ac -index bc3163a..b6a4221 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,6 +116,19 @@ AS_IF([test "x$have_dbus" = "xyes"], - - AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - -+dnl GDBus backend -+dnl This is the default backend if GIO is recent enough -+m4_define([gdbus_gio_required],[2.25.7]) -+PKG_CHECK_MODULES([GDBUS],[gio-2.0 >= gdbus_gio_required],[have_gdbus=yes],[have_gdbus=no]) -+ -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ AC_DEFINE([HAVE_GDBUS],[1],[Define if GDBus backend is enabled]) -+ ] -+ ) -+ -+AM_CONDITIONAL([HAVE_GDBUS],[test "$have_gdbus" = "yes"]) -+ - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus -@@ -146,7 +159,13 @@ AM_CONDITIONAL([HAVE_BACON], [test "x$have_bacon" = "xyes"]) - - dnl Choose the default backend - AC_MSG_CHECKING([for default IPC mechanism]) --AS_IF([test "x$have_dbus" = "xyes"], -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ UNIQUE_DEFAULT_BACKEND=gdbus -+ AC_MSG_RESULT([GDBus]) -+ ], -+ -+ [test "x$have_dbus" = "xyes"], - [ - UNIQUE_DEFAULT_BACKEND=dbus - AC_MSG_RESULT([D-Bus]) -@@ -243,6 +262,7 @@ AC_CONFIG_FILES([ - unique/uniqueversion.h - unique/bacon/Makefile - unique/dbus/Makefile -+ unique/gdbus/Makefile - tests/Makefile - po/Makefile.in - ]) -@@ -261,6 +281,7 @@ Configuration: - Backends: - Unix Domain Socket: $have_bacon - D-BUS: $have_dbus -+ GDBus: $have_gdbus - - Default backend: $UNIQUE_DEFAULT_BACKEND - " -diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am -index 3172588..2c1dbf4 100644 ---- a/doc/reference/Makefile.am -+++ b/doc/reference/Makefile.am -@@ -50,7 +50,8 @@ IGNORE_HFILES = \ - uniquemarshal.h \ - stamp-uniquemarshal.h \ - bacon \ -- dbus -+ dbus \ -+ gdbus - - EXTRA_HFILES = - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..8f0b7ba 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -12,7 +12,11 @@ if HAVE_DBUS - SUBDIRS += dbus - endif - --DIST_SUBDIRS = bacon dbus -+if HAVE_GDBUS -+SUBDIRS += gdbus -+endif -+ -+DIST_SUBDIRS = bacon dbus gdbus - - INCLUDES = -I$(top_srcdir) - -@@ -72,6 +76,10 @@ if HAVE_DBUS - unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la - endif - -+if HAVE_GDBUS -+unique_backend_libs += $(top_builddir)/unique/gdbus/libunique-gdbus.la -+endif -+ - uniquedir = $(includedir)/unique-1.0/unique - unique_HEADERS = \ - $(unique_sources_h) \ -diff --git a/unique/gdbus/.gitignore b/unique/gdbus/.gitignore -new file mode 100644 -index 0000000..c7e22c3 ---- /dev/null -+++ b/unique/gdbus/.gitignore -@@ -0,0 +1,2 @@ -+libunique_gdbus_la-uniquebackend-gdbus.lo -+libunique-gdbus.la -diff --git a/unique/gdbus/Makefile.am b/unique/gdbus/Makefile.am -new file mode 100644 -index 0000000..e10637d ---- /dev/null -+++ b/unique/gdbus/Makefile.am -@@ -0,0 +1,24 @@ -+include $(top_srcdir)/build/autotools/Makefile.am.silent -+ -+noinst_LTLIBRARIES = libunique-gdbus.la -+ -+libunique_gdbus_la_SOURCES = \ -+ uniquebackend-gdbus.h \ -+ uniquebackend-gdbus.c -+ -+libunique_gdbus_la_PPCFLAGS = \ -+ -DG_LOG_DOMAIN=\"Unique-GDBus\" \ -+ -DG_DISABLE_SINGLE_INCLUDES \ -+ -I$(top_srcdir) \ -+ $(AM_CPPFLAGS) -+ -+libunique_gdbus_la_CFLAGS = \ -+ $(UNIQUE_CFLAGS) \ -+ $(UNIQUE_DEBUG_CFLAGS) \ -+ $(MAINTAINER_CFLAGS) \ -+ $(GDBUS_CFLAGS) \ -+ $(AM_CFLAGS) -+ -+libunique_gdbus_la_LIBADD = \ -+ $(UNIQUE_LIBS) \ -+ $(GDBUS_LIBS) -diff --git a/unique/gdbus/uniquebackend-gdbus.c b/unique/gdbus/uniquebackend-gdbus.c -new file mode 100644 -index 0000000..14d54a9 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.c -@@ -0,0 +1,303 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi <ebassi(a)o-hand.com> -+ * Copyright © 2010 Christian Persch -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include <gio/gio.h> -+#include <gdk/gdk.h> -+ -+#include "../uniqueinternals.h" -+#include "uniquebackend-gdbus.h" -+ -+struct _UniqueBackendGDBus -+{ -+ UniqueBackend parent_instance; -+ -+ GDBusConnection *connection; -+ guint registration_id; -+ guint owner_id; -+ gboolean owns_name; -+ GMainLoop *loop; -+}; -+ -+struct _UniqueBackendGDBusClass -+{ -+ UniqueBackendClass parent_class; -+ GDBusNodeInfo *introspection_data; -+}; -+ -+G_DEFINE_TYPE (UniqueBackendGDBus, unique_backend_gdbus, UNIQUE_TYPE_BACKEND); -+ -+static const char introspection_xml[] = -+ "<node name='/'>" -+ "<interface name='org.gtk.UniqueApp'>" -+ "<method name='SendMessage'>" -+ "<arg name='command' type='s' direction='in'/>" -+ "<arg name='message' type='(suuus)' direction='in'/>" -+ "<arg name='time' type='u' direction='in'/>" -+ "<arg name='response' type='s' direction='out'/>" -+ "</method>" -+ "</interface>" -+ "</node>"; -+ -+static void -+method_call_cb (GDBusConnection *connection, -+ const gchar *sender, -+ const gchar *object_path, -+ const gchar *interface_name, -+ const gchar *method_name, -+ GVariant *parameters, -+ GDBusMethodInvocation *invocation, -+ gpointer user_data) -+{ -+ if (g_strcmp0 (interface_name, "org.gtk.UniqueApp") != 0 || -+ g_strcmp0 (object_path, "/Factory") != 0) -+ return; -+ -+ if (g_strcmp0 (method_name, "SendMessage") == 0) -+ { -+ UniqueBackend *backend = UNIQUE_BACKEND (user_data); -+ const gchar *command_str, *data, *startup_id; -+ guint len, screen_num, workspace, time_; -+ UniqueMessageData message_data; -+ gint command; -+ UniqueResponse response; -+ GdkDisplay *display; -+ -+ g_variant_get (parameters, -+ "(&s(&suuu&s)u)", -+ &command_str, -+ &data, &len, &screen_num, &workspace, &startup_id, -+ &time_); -+ -+ command = unique_command_from_string (backend->parent, command_str); -+ if (command == 0) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ G_DBUS_ERROR, -+ G_DBUS_ERROR_INVALID_ARGS, -+ "Invalid command `%s' received", -+ command_str); -+ return; -+ } -+ -+ display = gdk_display_get_default (); -+ -+ message_data.data = len > 0 ? (guchar *) data : NULL; -+ message_data.length = (gint) len; -+ message_data.workspace = workspace; -+ message_data.startup_id = (char *) startup_id; -+ if (screen_num >= 0 && screen_num < gdk_display_get_n_screens (display)) -+ message_data.screen = gdk_display_get_screen (display, screen_num); -+ else -+ message_data.screen = gdk_screen_get_default (); -+ -+ response = unique_app_emit_message_received (backend->parent, command, &message_data, time_); -+ -+ g_dbus_method_invocation_return_value (invocation, -+ g_variant_new ("(s)", unique_response_to_string (response))); -+ return; -+ } -+} -+ -+static void -+name_acquired_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = TRUE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static void -+name_lost_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = FALSE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static const GDBusInterfaceVTable interface_vtable = { -+ method_call_cb, -+ NULL, -+ NULL -+}; -+ -+static gboolean -+unique_backend_gdbus_request_name (UniqueBackend *backend) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ UniqueBackendGDBusClass *klass = UNIQUE_BACKEND_GDBUS_GET_CLASS (backend); -+ GError *error; -+ -+ error = NULL; -+ backend_gdbus->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); -+ if (!backend_gdbus->connection) -+ { -+ g_warning ("Unable to open a connection to the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->registration_id = -+ g_dbus_connection_register_object (backend_gdbus->connection, -+ "/Factory", -+ klass->introspection_data->interfaces[0], -+ &interface_vtable, -+ backend, NULL, -+ &error); -+ if (backend_gdbus->registration_id == 0) -+ { -+ g_warning ("Unable to register object with the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->owns_name = FALSE; -+ -+ backend_gdbus->owner_id = -+ g_bus_own_name_on_connection (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ G_BUS_NAME_OWNER_FLAGS_NONE, -+ name_acquired_cb, -+ name_lost_cb, -+ backend, NULL); -+ -+ backend_gdbus->loop = g_main_loop_new (NULL, FALSE); -+ g_main_loop_run (backend_gdbus->loop); -+ g_main_loop_unref (backend_gdbus->loop); -+ backend_gdbus->loop = NULL; -+ -+ return backend_gdbus->owns_name; -+} -+ -+static UniqueResponse -+unique_backend_gdbus_send_message (UniqueBackend *backend, -+ gint command, -+ UniqueMessageData *message_data, -+ guint time_) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ GVariantBuilder builder; -+ GVariant *result; -+ const gchar *command_str, *resp; -+ UniqueResponse response; -+ GError *error; -+ -+ command_str = unique_command_to_string (backend->parent, command); -+ -+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(s(suuus)u)")); -+ g_variant_builder_add (&builder, "s", command_str ? command_str : ""); -+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("(suuus)")); -+ g_variant_builder_add (&builder, "s", message_data->data ? (char *) message_data->data : ""); -+ g_variant_builder_add (&builder, "u", (guint) message_data->length); -+ g_variant_builder_add (&builder, "u", (guint) gdk_screen_get_number (message_data->screen)); -+ g_variant_builder_add (&builder, "u", (guint) message_data->workspace); -+ g_variant_builder_add (&builder, "s", message_data->startup_id ? message_data->startup_id : ""); -+ g_variant_builder_close (&builder); -+ g_variant_builder_add (&builder, "u", time_); -+ -+ error = NULL; -+ result = g_dbus_connection_call_sync (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ "/Factory", -+ "org.gtk.UniqueApp", -+ "SendMessage", -+ g_variant_builder_end (&builder), -+ G_VARIANT_TYPE ("(s)"), -+ G_DBUS_CALL_FLAGS_NO_AUTO_START, -+ -1, -+ NULL, -+ &error); -+ if (error) -+ { -+ g_warning ("Error while sending message: %s", error->message); -+ g_error_free (error); -+ -+ return UNIQUE_RESPONSE_INVALID; -+ } -+ -+ g_variant_get (result, "(&s)", &resp); -+ response = unique_response_from_string (resp); -+ g_variant_unref (result); -+ -+ return response; -+} -+ -+static void -+unique_backend_gdbus_dispose (GObject *gobject) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (gobject); -+ -+ if (backend_gdbus->owner_id != 0) -+ { -+ g_bus_unown_name (backend_gdbus->owner_id); -+ backend_gdbus->owner_id = 0; -+ } -+ if (backend_gdbus->registration_id != 0) -+ { -+ g_assert (backend_gdbus->connection != NULL); -+ g_dbus_connection_unregister_object (backend_gdbus->connection, -+ backend_gdbus->registration_id); -+ backend_gdbus->registration_id = 0; -+ } -+ if (backend_gdbus->connection) -+ { -+ g_object_unref (backend_gdbus->connection); -+ backend_gdbus->connection = NULL; -+ } -+ -+ G_OBJECT_CLASS (unique_backend_gdbus_parent_class)->dispose (gobject); -+} -+ -+static void -+unique_backend_gdbus_class_init (UniqueBackendGDBusClass *klass) -+{ -+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -+ UniqueBackendClass *backend_class = UNIQUE_BACKEND_CLASS (klass); -+ -+ gobject_class->dispose = unique_backend_gdbus_dispose; -+ -+ backend_class->request_name = unique_backend_gdbus_request_name; -+ backend_class->send_message = unique_backend_gdbus_send_message; -+ -+ klass->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); -+ g_assert (klass->introspection_data != NULL); -+} -+ -+static void -+unique_backend_gdbus_init (UniqueBackendGDBus *backend) -+{ -+} -diff --git a/unique/gdbus/uniquebackend-gdbus.h b/unique/gdbus/uniquebackend-gdbus.h -new file mode 100644 -index 0000000..41eb6e5 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.h -@@ -0,0 +1,43 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi <ebassi(a)o-hand.com> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifndef __UNIQUE_BACKEND_GDBUS_H__ -+#define __UNIQUE_BACKEND_GDBUS_H__ -+ -+#include <unique/uniquebackend.h> -+ -+G_BEGIN_DECLS -+ -+#define UNIQUE_TYPE_BACKEND_GDBUS (unique_backend_gdbus_get_type ()) -+#define UNIQUE_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBus)) -+#define UNIQUE_IS_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+#define UNIQUE_IS_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+ -+typedef struct _UniqueBackendGDBus UniqueBackendGDBus; -+typedef struct _UniqueBackendGDBusClass UniqueBackendGDBusClass; -+ -+GType unique_backend_gdbus_get_type (void) G_GNUC_CONST; -+ -+G_END_DECLS -+ -+#endif /* __UNIQUE_BACKEND_GDBUS_H__ */ -diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c -index 18a0c45..a76e42e 100644 ---- a/unique/uniquebackend.c -+++ b/unique/uniquebackend.c -@@ -298,6 +298,9 @@ unique_backend_send_message (UniqueBackend *backend, - #ifdef HAVE_DBUS - #include "dbus/uniquebackend-dbus.h" - #endif -+#ifdef HAVE_GDBUS -+#include "gdbus/uniquebackend-gdbus.h" -+#endif - - /** - * unique_backend_create: -@@ -329,6 +332,10 @@ unique_backend_create (void) - if (strcmp (backend_name, "dbus") == 0) - backend_gtype = unique_backend_dbus_get_type (); - #endif /* HAVE_DBUS */ -+#ifdef HAVE_GDBUS -+ if (strcmp (backend_name, "gdbus") == 0) -+ backend_gtype = unique_backend_gdbus_get_type (); -+#endif /* HAVE_GDBUS */ - #if !defined(HAVE_BACON) && !defined(HAVE_DBUS) - #error Need either bacon or dbus - #endif --- -cgit v0.8.3.1 -diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000 -@@ -781,7 +781,7 @@ - } - - --G_CONST_RETURN gchar * -+const gchar * - unique_command_to_string (UniqueApp *app, - gint command) - { -@@ -863,7 +863,7 @@ - return retval; - } - --G_CONST_RETURN gchar * -+const gchar * - unique_response_to_string (UniqueResponse response) - { - GEnumClass *enum_class; -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950 +0000 -@@ -111,7 +111,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_name (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -@@ -154,7 +154,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_startup_id (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492 +0000 -@@ -94,10 +94,10 @@ - - UniqueBackend * unique_backend_create (void); - --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); -+const gchar *unique_backend_get_name (UniqueBackend *backend); - void unique_backend_set_name (UniqueBackend *backend, - const gchar *name); --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); - void unique_backend_set_startup_id (UniqueBackend *backend, - const gchar *startup_id); - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); -diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914 +0000 -@@ -44,11 +44,11 @@ - * and then back into an id - */ - UniqueResponse unique_response_from_string (const gchar *response); --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); -+const gchar *unique_response_to_string (UniqueResponse response); - - gint unique_command_from_string (UniqueApp *app, - const gchar *command); --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, -+const gchar *unique_command_to_string (UniqueApp *app, - gint command); - - G_END_DECLS -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713 +0000 -@@ -185,7 +185,7 @@ - * - * Since: 1.0.2 - */ --G_CONST_RETURN guchar * -+const guchar * - unique_message_data_get (UniqueMessageData *message_data, - gsize *length) - { -@@ -525,7 +525,7 @@ - * owned by the #UniqueMessageData structure and should not be - * modified or freed - */ --G_CONST_RETURN gchar * -+const gchar * - unique_message_data_get_startup_id (UniqueMessageData *message_data) - { - g_return_val_if_fail (message_data != NULL, NULL); -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565 +0000 -@@ -48,7 +48,7 @@ - void unique_message_data_set (UniqueMessageData *message_data, - const guchar *data, - gsize length); --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, -+const guchar *unique_message_data_get (UniqueMessageData *message_data, - gsize *length); - - gboolean unique_message_data_set_text (UniqueMessageData *message_data, -@@ -63,7 +63,7 @@ - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); - - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); - guint unique_message_data_get_workspace (UniqueMessageData *message_data); - - G_END_DECLS

1 0

ports/opt (3.0): subversion: added -j1 make option again
by crux＠crux.nu 02 Jul '13

02 Jul '13

commit ba8145c883ea8f9bcc3eeeb7c19df07f0c15cbe7 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Tue Jul 2 17:51:48 2013 +0200 subversion: added -j1 make option again diff --git a/subversion/Pkgfile b/subversion/Pkgfile index dca3641..1b66e5d 100644 --- a/subversion/Pkgfile +++ b/subversion/Pkgfile @@ -22,7 +22,7 @@ build() { --disable-nls make - make DESTDIR=$PKG install + make -j1 DESTDIR=$PKG install # info pages seem to get generated when makeinfo is available rm -rf $PKG/usr/info

1 0