| 1 |
eva 10/08/29 21:21:53 |
| 2 |
|
| 3 |
Added: gnome-cups-manager-0.33-automagic-samba.patch |
| 4 |
gnome-cups-manager-0.33-cxxflags-separation.patch |
| 5 |
Log: |
| 6 |
Do not add CFLAGS to CXXFLAGS, bug #234028. Fix automagic samba support, bug #288392. |
| 7 |
|
| 8 |
(Portage version: 2.2_rc68/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-automagic-samba.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gnome-cups-manager-0.33-automagic-samba.patch |
| 17 |
=================================================================== |
| 18 |
From d3750520a2b23d0757504941ba2066cb63b320d0 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Gilles Dartiguelongue <eva@g.o> |
| 20 |
Date: Sun, 29 Aug 2010 16:30:23 +0200 |
| 21 |
Subject: [PATCH] [gentoo] Fix automagic samba support |
| 22 |
|
| 23 |
--- |
| 24 |
configure.in | 6 +++++- |
| 25 |
1 files changed, 5 insertions(+), 1 deletions(-) |
| 26 |
|
| 27 |
diff --git a/configure.in b/configure.in |
| 28 |
index bb15f54..c96fcba 100644 |
| 29 |
--- a/configure.in |
| 30 |
+++ b/configure.in |
| 31 |
@@ -28,10 +28,14 @@ LIBBONOBO_REQUIRED=2.0.0 |
| 32 |
LIBGNOMECUPS_REQUIRED=0.2.0 |
| 33 |
|
| 34 |
SMBLIBS= |
| 35 |
+AC_ARG_ENABLE([samba], |
| 36 |
+ AS_HELP_STRING([--enable-samba], [enable samba support])) |
| 37 |
+if test "$enable_samba" = "yes"; then |
| 38 |
AC_CHECK_LIB(smbclient, smbc_opendir, [ |
| 39 |
AC_DEFINE(HAVE_LIBSMBCLIENT, [], ["Do we have libsmbclient"]) |
| 40 |
SMBLIBS=-lsmbclient |
| 41 |
-]) |
| 42 |
+], [AC_MSG_ERROR([libsmclient not found])]) |
| 43 |
+fi |
| 44 |
AC_SUBST(SMBLIBS) |
| 45 |
AC_SUBST(LIBGNOME_REQUIRED) |
| 46 |
AC_SUBST(LIBGNOMEUI_REQUIRED) |
| 47 |
-- |
| 48 |
1.7.2.2 |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.33-cxxflags-separation.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: gnome-cups-manager-0.33-cxxflags-separation.patch |
| 59 |
=================================================================== |
| 60 |
From f798321d4d7e3059bc51730124f9da9d5c2aff9f Mon Sep 17 00:00:00 2001 |
| 61 |
From: Gilles Dartiguelongue <eva@g.o> |
| 62 |
Date: Sun, 29 Aug 2010 15:21:17 +0200 |
| 63 |
Subject: [PATCH] [gentoo] Do not add CFLAGS to CPPFLAGS |
| 64 |
|
| 65 |
--- |
| 66 |
configure.in | 1 + |
| 67 |
gnome-cups-add/Makefile.am | 6 ++++-- |
| 68 |
gnome-cups-manager/Makefile.am | 6 ++++-- |
| 69 |
libgnomecups/Makefile.am | 6 ++++-- |
| 70 |
4 files changed, 13 insertions(+), 6 deletions(-) |
| 71 |
|
| 72 |
diff --git a/configure.in b/configure.in |
| 73 |
index 88902da..bb15f54 100644 |
| 74 |
--- a/configure.in |
| 75 |
+++ b/configure.in |
| 76 |
@@ -16,6 +16,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) |
| 77 |
|
| 78 |
GNOME_COMPILE_WARNINGS(maximum) |
| 79 |
|
| 80 |
+AC_PROG_CC |
| 81 |
AC_PROG_CXX |
| 82 |
|
| 83 |
GTK_REQUIRED=2.3.1 |
| 84 |
diff --git a/gnome-cups-add/Makefile.am b/gnome-cups-add/Makefile.am |
| 85 |
index 2d5ceee..9c16248 100644 |
| 86 |
--- a/gnome-cups-add/Makefile.am |
| 87 |
+++ b/gnome-cups-add/Makefile.am |
| 88 |
@@ -1,5 +1,7 @@ |
| 89 |
-INCLUDES = \ |
| 90 |
- $(WARN_CFLAGS) \ |
| 91 |
+AM_CFLAGS = $(WARN_CFLAGS) |
| 92 |
+AM_CXXFLAGS = $(WARN_CXXFLAGS) |
| 93 |
+ |
| 94 |
+AM_CPPFLAGS = \ |
| 95 |
$(GNOME_CFLAGS) \ |
| 96 |
-I$(top_srcdir) \ |
| 97 |
-DPREFIX=\""$(prefix)"\" \ |
| 98 |
diff --git a/gnome-cups-manager/Makefile.am b/gnome-cups-manager/Makefile.am |
| 99 |
index b8fe59a..86721ad 100644 |
| 100 |
--- a/gnome-cups-manager/Makefile.am |
| 101 |
+++ b/gnome-cups-manager/Makefile.am |
| 102 |
@@ -1,5 +1,7 @@ |
| 103 |
-INCLUDES = \ |
| 104 |
- $(WARN_CFLAGS) \ |
| 105 |
+AM_CFLAGS = $(WARN_CFLAGS) |
| 106 |
+AM_CXXFLAGS = $(WARN_CXXFLAGS) |
| 107 |
+ |
| 108 |
+AM_CPPFLAGS = \ |
| 109 |
$(GNOME_CFLAGS) \ |
| 110 |
-I$(top_srcdir) \ |
| 111 |
-DPREFIX=\""$(prefix)"\" \ |
| 112 |
diff --git a/libgnomecups/Makefile.am b/libgnomecups/Makefile.am |
| 113 |
index 75a2fc7..6b8cea0 100644 |
| 114 |
--- a/libgnomecups/Makefile.am |
| 115 |
+++ b/libgnomecups/Makefile.am |
| 116 |
@@ -1,7 +1,9 @@ |
| 117 |
SUBDIRS=snmpkit |
| 118 |
|
| 119 |
-INCLUDES = \ |
| 120 |
- $(WARN_CFLAGS) \ |
| 121 |
+AM_CFLAGS = $(WARN_CFLAGS) |
| 122 |
+AM_CXXFLAGS = $(WARN_CXXFLAGS) |
| 123 |
+ |
| 124 |
+AM_CPPFLAGS = \ |
| 125 |
$(GNOME_CFLAGS) \ |
| 126 |
-I$(top_srcdir) \ |
| 127 |
-I$(top_builddir) \ |
| 128 |
-- |
| 129 |
1.7.2.2 |
Archives