Re: 2.8

Colin Walters <[email protected]> Fri, 09 Jul 2004 15:27:15 -0400
Newsgroups gmane.comp.gnome.print
Message-ID <[email protected]> 
On Thu, 2004-06-24 at 16:14 -0400, Jody Goldberg wrote:
> On Wed, Jun 23, 2004 at 06:17:13PM -0400, Colin Walters wrote:
> > 
> > So what's the opinion on getting all of this into GNOME 2.8?  Do you
> > guys think it's doable?
> > 
> > I briefly talked to Jody about this, and I believe he said he'd like to
> > roll libgnomecups into libgnomeprint?  In that case we wouldn't have to
> > worry about another module.
> 
> Yes, unless someone objects I'd like to do that.  It's always
> somwhat irritating to release modules in lockstep, and I don't see a
> huge benefit to keeping something as small as libgnomecups
> standalone.

I had a look at doing this merge.  Attached are two patches that are a
rough cut.  I basically just moved the "libgnomecups" subdirectory of
libgnomecups into libgnomeprint/libgnomeprint.  I thought about putting
it in modules/ or something, and trying to have a generic wrapper around
it, but I decided that didn't make sense, and just putting it in
libgnomeprint/libgnomeprint made the most sense.

So the first patch sets up the libgnomeprint infrastructure to add the
new subdirectory.  The second patch is relative to the existing
libgnomecups module in the tree.  Basically just after moving that
directory, apply the second patch.

_______________________________________________
gnome-print-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/gnome-print-list
libgnomeprint-libgnomecups-integration.patch (text/x-patch, 1.5 KB) 
? doc/reference/libgnomeprint.interfaces
? doc/reference/libgnomeprint.prerequisites
? doc/reference/xml
? libgnomeprint/libgnomecups
? libgnomeprint/ttsubset/Makefile
? libgnomeprint/ttsubset/Makefile.in
? tests/pango
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeprint/configure.in,v
retrieving revision 1.291
diff -u -d -u -r1.291 configure.in
--- configure.in	29 Jun 2004 23:28:53 -0000	1.291
+++ configure.in	9 Jul 2004 19:14:47 -0000
@@ -304,6 +304,7 @@
 po/Makefile.in
 libgnomeprint/Makefile
 libgnomeprint/gpa/Makefile
+libgnomeprint/libgnomecups/Makefile
 libgnomeprint/ttsubset/Makefile
 libgnomeprint/transports/Makefile
 libgnomeprint/libgnomeprint-2.2.pc
Index: libgnomeprint/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnomeprint/libgnomeprint/Makefile.am,v
retrieving revision 1.103
diff -u -d -u -r1.103 Makefile.am
--- libgnomeprint/Makefile.am	21 Jun 2004 20:39:07 -0000	1.103
+++ libgnomeprint/Makefile.am	9 Jul 2004 19:14:47 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = gpa ttsubset . transports modules
+SUBDIRS = gpa ttsubset libgnomecups . transports modules
 
 temp_sources = \
 	art_rgb_affine_private.h \
@@ -98,6 +98,11 @@
 	gpa/libgpa.la \
 	ttsubset/libttsubset.la \
 	$(LIBGNOMEPRINT_LIBS)
+
+if HAVE_CUPS
+libgnomeprint_2_2_la_LIBADD += \
+	libgnomecups/libgnomecups.la
+endif
 
 libgnomeprint_2_2_la_LDFLAGS = \
 	-no-undefined
libgnomeprint-libgnomecups-integration2.patch (text/x-patch, 1.2 KB) 
--- /src/cvs/cvs.gnome.org/libgnomecups/libgnomecups/Makefile.am	2003-05-02 06:35:23.000000000 -0400
+++ Makefile.am	2004-07-09 14:52:54.741338520 -0400
@@ -1,20 +1,20 @@
+if HAVE_CUPS
+
 INCLUDES = 						\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
 	$(WARN_CFLAGS)                                  \
 	$(CUPS_CFLAGS)                                  \
-	$(LIBGNOMECUPS_CFLAGS)                          \
+	$(LIBGNOMEPRINT_CFLAGS)                          \
         -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"  \
 	-DDATADIR=\""$(datadir)"\"
 
-LDFLAGS=@LT_VERSION_INFO@
-
-lib_LTLIBRARIES=libgnomecups-1.0.la
-libgnomecups_1_0_la_LDFLAGS = \
+noinst_LTLIBRARIES=libgnomecups.la
+libgnomecups_la_LDFLAGS = \
 	$(CUPS_LIBS) \
-	$(LIBGNOMECUPS_LIBS)
+	$(LIBGNOMEPRINT_LIBS)
 
-libgnomecups_1_0_la_SOURCES = \
+libgnomecups_la_SOURCES = \
 	gnome-cups-i18n.c \
 	gnome-cups-i18n.h \
 	gnome-cups-init.c \
@@ -25,7 +25,7 @@
 	util.c \
 	util.h
 
-libgnomecupsincludedir=$(includedir)/libgnomecups-1/libgnomecups
+libgnomecupsincludedir=$(includedir)/libgnomeprint-2.2/libgnomeprint
 
 libgnomecupsinclude_HEADERS = \
 	gnome-cups-init.h \
@@ -40,3 +40,4 @@
 
 EXTRA_DIST=$(libgnomecupsinclude_HEADERS)
 
+endif
signature.asc (application/pgp-signature, 189 B) 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBA7vGTOIkJWWp2WGURAm/ZAJ41wR2EAromSxVHJPDCcp9Ey20mwACfUN7g
YZwRdVaFeUKZOmXFp9lHxFY=
=lpyg
-----END PGP SIGNATURE-----