libunique: new maintainer, use patch from BLFS

3 files changed, 19 insertions, 141 deletions

diff --git a/libunique/.signature b/libunique/.signature
index d24416a62..a219f2c68 100644
--- a/libunique/.signature
+++ b/libunique/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/WR8FBeKc/o6kG6v1eKKzLKW38lGy/9ApGPl3p2ce5duWr2kzwSHBCUYkX/N5bEM6vhRAlOQgG1//kddBfKefAg=
-SHA256 (Pkgfile) = 9139e41fac77f104f99a69a86f6070f93d0a373408dd81fca0c47e74bb99f3f3
+RWSE3ohX2g5d/UipwypcW6KSWYTudM/lsmKQxEEBaJe0LiW/Q5WPc+aBgxn2gJqyuFsf88x6X91r2CyDfradgyZz2SleOd/uiwY=
+SHA256 (Pkgfile) = 47be19aa0196e5cbada357332167e436362398a244e73b51a84e05bd19bf2468
 SHA256 (.footprint) = f10a391e8c050c0eb34cf9ef4db2a0644c58ae316a07395c7f7ccc0a5263a610
 SHA256 (libunique-1.1.6.tar.bz2) = e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
-SHA256 (G_CONST_RETURN.patch) = 0ff78cc325190d0a167257321c9381befaab0769ff829c4dd50ddbaca337407a
+SHA256 (libunique-1.1.6-upstream_fixes-1.patch) = 36203c672c520e508e38b59ab7cc65297ac209e0e70a398b78275687a2126589
diff --git a/libunique/G_CONST_RETURN.patch b/libunique/G_CONST_RETURN.patch
deleted file mode 100644
index f3bb29743..000000000
--- a/libunique/G_CONST_RETURN.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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 098e85b6b..78042e0fa 100644
--- a/libunique/Pkgfile
+++ b/libunique/Pkgfile
@@ -1,32 +1,28 @@
 # Description: Unique is a library for writing single instance application
-# URL: https://wiki.gnome.org/Attic/LibUnique
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
-# Depends on: gtk xorg-libxdamage
+# URL:         http://live.gnome.org/LibUnique
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Depends on:  gtk3 xorg-libxdamage
 
 name=libunique
 version=1.1.6
-release=4
+release=5
 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \
-        G_CONST_RETURN.patch)
+        http://www.linuxfromscratch.org/patches/blfs/svn/$name-$version-upstream_fixes-1.patch)
 
 build() {
-  cd $name-$version
+	cd $name-$version
 
-  patch -p1 -i $SRC/G_CONST_RETURN.patch
+	patch -p1 -i $SRC/$name-$version-upstream_fixes-1.patch
 
-  ./configure --prefix=/usr \
-              --disable-dbus \
-              --disable-static \
-              --disable-debug \
-              --with-x
+	autoreconf -fi
+	./configure \
+		--prefix=/usr \
+		--disable-dbus \
+		--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
 
-  make
-  make DESTDIR=$PKG install
-
-  rm -rf $PKG/usr/share/gtk-doc
+	rm -r $PKG/usr/share/gtk-doc
 }