[gentoo-commits] gentoo-x86 commit in app-admin/gam-server/files: gam-server-0.1.10-armel-features.patch gam-server-0.1.10-G_CONST_RETURN-removal.patch gam-server-0.1.10-crosscompile-fix.patch

[Pacho Ramos (pacho)]

pacho       11/09/25 16:17:35

  Added:                gam-server-0.1.10-armel-features.patch
                        gam-server-0.1.10-G_CONST_RETURN-removal.patch
                        gam-server-0.1.10-crosscompile-fix.patch
  Log:
  Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't try to even check for python, simplifying ebuild for people running python3 as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball instead of gz.
  
  (Portage version: 2.1.10.19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch?rev=1.1&content-type=text/plain

Index: gam-server-0.1.10-armel-features.patch
===================================================================
From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <slomo@××××××.org>
Date: Tue, 15 Dec 2009 12:24:25 +0000
Subject: Bug 588338 - Enable linux specific features on armel

---
diff --git a/configure.in b/configure.in
index b0bbaec..e4b684e 100644
--- a/configure.in
+++ b/configure.in
@@ -176,7 +176,7 @@ fi
 
 dnl check what OS we're on
 #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
-if test x$target_os = xlinux-gnu; then
+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
 	AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
 fi
 
@@ -223,7 +223,7 @@ fi
 dnl check if inotify backend is enabled
 AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
 
-if test x$os = xlinux-gnu; then
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
 	AC_ARG_ENABLE(dnotify,
 		AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
 		[dnotify="${enableval}"], [dnotify=true])
@@ -297,10 +297,12 @@ else
 fi
 
 dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
-    if test "${CC}" = "gcc" ; then
-        echo Use weak symbols !
-        THREAD_LIBS=
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
+    if test x$WITH_THREADS = x1 ; then
+      if test "${CC}" = "gcc" ; then
+          echo Use weak symbols !
+          THREAD_LIBS=
+      fi
     fi
 fi	
 AC_SUBST(THREAD_LIBS)
--
cgit v0.9.0.2



1.1                  app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch?rev=1.1&content-type=text/plain

Index: gam-server-0.1.10-G_CONST_RETURN-removal.patch
===================================================================
From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
From: Maciej Piechotka <uzytkownik2@×××××.com>
Date: Tue, 13 Sep 2011 09:47:05 +0200
Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN

---
 server/gam_node.c         |    2 +-
 server/gam_node.h         |    2 +-
 server/gam_subscription.c |    2 +-
 server/gam_subscription.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/gam_node.c b/server/gam_node.c
index 02358ba..d0302d2 100644
--- a/server/gam_node.c
+++ b/server/gam_node.c
@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
  * it has finished with the string.  If it must keep it longer, it
  * should makes its own copy.  The returned string must not be freed.
  */
-G_CONST_RETURN char *
+const char *
 gam_node_get_path(GamNode * node)
 {
     g_assert(node);
diff --git a/server/gam_node.h b/server/gam_node.h
index 02c8692..83349a8 100644
--- a/server/gam_node.h
+++ b/server/gam_node.h
@@ -58,7 +58,7 @@ gboolean              gam_node_is_dir              (GamNode         *node);
 void                  gam_node_set_is_dir          (GamNode         *node,
 						   gboolean        is_dir);
 	
-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
+const char           *gam_node_get_path            (GamNode         *node);
 
 GList                *gam_node_get_subscriptions   (GamNode         *node);
 
diff --git a/server/gam_subscription.c b/server/gam_subscription.c
index dfa3273..4675b34 100644
--- a/server/gam_subscription.c
+++ b/server/gam_subscription.c
@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
  * @param sub the GamSubscription
  * @returns The path being monitored.  It should not be freed.
  */
-G_CONST_RETURN char *
+const char *
 gam_subscription_get_path(GamSubscription * sub)
 {
     if (sub == NULL)
diff --git a/server/gam_subscription.h b/server/gam_subscription.h
index d894fbe..e6b4e15 100644
--- a/server/gam_subscription.h
+++ b/server/gam_subscription.h
@@ -21,7 +21,7 @@ int                  gam_subscription_pathlen      (GamSubscription *sub);
 
 int                  gam_subscription_get_reqno    (GamSubscription *sub);
 
-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
+const char          *gam_subscription_get_path     (GamSubscription *sub);
 
 GamListener         *gam_subscription_get_listener (GamSubscription *sub);
 
-- 
1.7.6.1




1.1                  app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch?rev=1.1&content-type=text/plain

Index: gam-server-0.1.10-crosscompile-fix.patch
===================================================================
--- configure.in.orig	2009-04-26 23:00:43.445135823 +0300
+++ configure.in	2009-04-26 23:25:04.042489243 +0300
@@ -389,8 +389,7 @@
 
 AC_MSG_CHECKING(abstract socket namespace)
 AC_LANG_PUSH(C)
-AC_RUN_IFELSE([AC_LANG_PROGRAM(
-[[
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
@@ -398,8 +397,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <errno.h>
-]],
-[[
+
+int main() {
   int listen_fd;
   struct sockaddr_un addr;
   
@@ -424,9 +423,11 @@
     }
   else 
     exit (0);
-]])],
-              [have_abstract_sockets=yes],
-              [have_abstract_sockets=no])
+}
+],
+have_abstract_sockets=yes,
+have_abstract_sockets=no,
+have_abstract_sockets=no)
 AC_LANG_POP(C)
 AC_MSG_RESULT($have_abstract_sockets)