commit 91394d0f3d721247334ef5c9594eb3cffa2cfeec Author: Jose V Beneyto <sepen@crux.nu> Date: Tue Aug 19 13:23:17 2014 +0200 libunique: updated to 3.0.2 diff --git a/libunique/.footprint b/libunique/.footprint index 5bfc85d..15c6dc9 100644 --- a/libunique/.footprint +++ b/libunique/.footprint @@ -1,22 +1,22 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/unique-1.0/ -drwxr-xr-x root/root usr/include/unique-1.0/unique/ --rw-r--r-- root/root usr/include/unique-1.0/unique/unique.h --rw-r--r-- root/root usr/include/unique-1.0/unique/uniqueapp.h --rw-r--r-- root/root usr/include/unique-1.0/unique/uniquebackend.h --rw-r--r-- root/root usr/include/unique-1.0/unique/uniqueenumtypes.h --rw-r--r-- root/root usr/include/unique-1.0/unique/uniquemessage.h --rw-r--r-- root/root usr/include/unique-1.0/unique/uniqueversion.h +drwxr-xr-x root/root usr/include/unique-3.0/ +drwxr-xr-x root/root usr/include/unique-3.0/unique/ +-rw-r--r-- root/root usr/include/unique-3.0/unique/unique.h +-rw-r--r-- root/root usr/include/unique-3.0/unique/uniqueapp.h +-rw-r--r-- root/root usr/include/unique-3.0/unique/uniquebackend.h +-rw-r--r-- root/root usr/include/unique-3.0/unique/uniqueenumtypes.h +-rw-r--r-- root/root usr/include/unique-3.0/unique/uniquemessage.h +-rw-r--r-- root/root usr/include/unique-3.0/unique/uniqueversion.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ --rw-r--r-- root/root usr/lib/girepository-1.0/Unique-1.0.typelib --rwxr-xr-x root/root usr/lib/libunique-1.0.la -lrwxrwxrwx root/root usr/lib/libunique-1.0.so -> libunique-1.0.so.0.100.6 -lrwxrwxrwx root/root usr/lib/libunique-1.0.so.0 -> libunique-1.0.so.0.100.6 --rwxr-xr-x root/root usr/lib/libunique-1.0.so.0.100.6 +-rw-r--r-- root/root usr/lib/girepository-1.0/Unique-3.0.typelib +-rwxr-xr-x root/root usr/lib/libunique-3.0.la +lrwxrwxrwx root/root usr/lib/libunique-3.0.so -> libunique-3.0.so.0.0.2 +lrwxrwxrwx root/root usr/lib/libunique-3.0.so.0 -> libunique-3.0.so.0.0.2 +-rwxr-xr-x root/root usr/lib/libunique-3.0.so.0.0.2 drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/unique-1.0.pc +-rw-r--r-- root/root usr/lib/pkgconfig/unique-3.0.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/gir-1.0/ --rw-r--r-- root/root usr/share/gir-1.0/Unique-1.0.gir +-rw-r--r-- root/root usr/share/gir-1.0/Unique-3.0.gir diff --git a/libunique/.md5sum b/libunique/.md5sum index 7dfa89b..f6f4592 100644 --- a/libunique/.md5sum +++ b/libunique/.md5sum @@ -1,2 +1,2 @@ 0ebc031bd35a550fbc440d1bc4a19c5e G_CONST_RETURN.patch -7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 +89c3f88c9bfc35b3f13fa2b7bda0c354 libunique-3.0.2.tar.bz2 diff --git a/libunique/G_CONST_RETURN.patch b/libunique/G_CONST_RETURN.patch deleted file mode 100644 index f3bb297..0000000 --- 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 3d01d01..e1873c0 100644 --- a/libunique/Pkgfile +++ b/libunique/Pkgfile @@ -5,26 +5,19 @@ # Depends on: gtk xorg-libxdamage name=libunique -version=1.1.6 -release=4 -source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \ - G_CONST_RETURN.patch) +version=3.0.2 +release=1 +source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2) build() { cd $name-$version - 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