Mercurial Mercurial > upstream > spec-files-extra / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/mugshot-03-Ispace.diff
author laca_
Mon, 15 Oct 2007 04:11:32 +0000
changeset 547 e9deddedd4d8
permissions -rw-r--r--
2007-10-14 Laszlo (Laca) Peter <[email protected]> * include/prod.inc: define sf_mirror: the preferred sourceforge.net mirror. You can define a different one using pkgtool --define 'sf_mirror foo.dl.sf.net' or echo '%sf_mirror foo.dl.sf.net' >> ~/.pkgbuildmacros * SFEafterstep.spec: define CC as /usr/sfw/bin/gcc -- doesn't build with /usr/gnu/bin/gcc because it uses gnu ld * SFEantlr.spec: bump to 3.0.1 * SFEarj.spec: fix packaging * SFEasterisk.spec: fix some dir attributes * SFEavfs.spec: use sf_mirror macro for sourceforge download site * SFEbogofilter.spec: use sf_mirror macro for sourceforge download site * SFEcpio.spec: add l10n subpkg * SFEddclient.spec: use sf_mirror macro for sourceforge download site * SFEdenyhosts.spec: use sf_mirror macro for sourceforge download site * SFEfindutils.spec: fix l10n install * SFEfont-terminus.spec: add /usr/X11/bin to PATH for FOX build * SFEgc.spec: delete; same as SFEhp-gc, now SFEbdw-gc * SFEgdal.spec: fix packaging * SFEgtkglext.spec: fix packaging * SFEhp-gc.spec: rename to SFEbdw-gc * SFEinkscape.spec: s/hp-gc/bdw-gc/ * SFElibid3tag-gnu.spec: use sf_mirror macro for sourceforge d/l site * SFElibid3tag.spec: use sf_mirror macro for sourceforge download site * SFElibmng.spec: use sf_mirror macro for sourceforge download site * SFElibstatgab.spec: rename to follow conventions * SFElibuninum.spec: fix _datadir permissions * SFEloudmouth.spec: bump to 1.2.2 * SFEmedit.spec: fix packaging * SFEmoin.spec: use sf_mirror macro for sourceforge download site * SFEmonkey-bubble.spec: bump to 0.4.0 * SFEmrxvt.spec: use sf_mirror macro for sourceforge download site * SFEmugshot.spec: bump to 1.1.56; add patches * SFEnasm.spec: use sf_mirror macro for sourceforge download site * SFEneon.spec: bump to 0.26.2 * SFEnetcat.spec: use sf_mirror macro for sourceforge download site * SFEp7zip.spec: use sf_mirror macro for sourceforge download site * SFEproj4.spec: fix packaging * SFEruby.spec: bump to 1.8.6-p111; delete upstream patch * SFEsourcenav.spec: delete clashing man pages * SFEsubversion.spec: bump to 1.4.4 * SFEtre.spec: fix for directory attributes * SFEw3m.spec: s/gc/bdw-gc * SFExchat.spec: delete MSGFMT env var so it builds on indiana * SFExtail.spec: fix _datadir permissions * base-specs/afterstep.spec: move CC definition to SFEafterstep.spec * base-specs/electric-fence.spec: update tarball name * linux-specs/aria2.spec: use sf_mirror macro for sf d/l site * linux-specs/openobex.spec: use sf_mirror macro for sf d/l site * patches/monkey-bubble-01-build.diff: update for 0.4.0 * patches/mugshot-01-xscreensaver.diff: fix XScreenSaver flags * patches/mugshot-02-nspr4.diff: find nspr in /usr/lib/mps * patches/mugshot-03-Ispace.diff: delete spaces before -I CFLAGS * patches/mugshot-04-__FUNCTION__.diff: s/__FUNCTION__/G_GNUC_FUNCTION/ * patches/ruby-01-isinf.diff: delete, upstream

--- mugshot-1.1.56/Makefile-libhippofirefox.am.orig	2007-10-14 21:38:33.026337000 -0400
+++ mugshot-1.1.56/Makefile-libhippofirefox.am	2007-10-14 21:39:00.374671000 -0400
@@ -56,30 +56,30 @@
 libhippofirefox_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)				\
 	$(LIBHIPPOFIREFOX_CFLAGS)		\
-	-I $(FIREFOX_SRCDIR)/include		\
-	-I $(COMMONSRCDIR)/hippoipc		\
-	-I config/hippo
+	-I$(FIREFOX_SRCDIR)/include		\
+	-I$(COMMONSRCDIR)/hippoipc		\
+	-Iconfig/hippo
 
 # The include of $(GECKO_INCLUDEDIR) in the FULL_GECKO case is for 
 # Ubuntu, which has a mix of the gecko-sdk directory arrangement
 # with including the full set of headers
 if HAVE_FULL_GECKO
 libhippofirefox_la_CPPFLAGS +=			\
-	-I $(GECKO_INCLUDEDIR)			\
-	-I $(GECKO_INCLUDEDIR)/caps		\
-	-I $(GECKO_INCLUDEDIR)/docshell		\
-	-I $(GECKO_INCLUDEDIR)/dom		\
-	-I $(GECKO_INCLUDEDIR)/gfx		\
-	-I $(GECKO_INCLUDEDIR)/js		\
-	-I $(GECKO_INCLUDEDIR)/necko		\
-	-I $(GECKO_INCLUDEDIR)/string		\
-	-I $(GECKO_INCLUDEDIR)/widget		\
-	-I $(GECKO_INCLUDEDIR)/xpcom		\
-	-I $(GECKO_INCLUDEDIR)/xpconnect
+	-I$(GECKO_INCLUDEDIR)			\
+	-I$(GECKO_INCLUDEDIR)/caps		\
+	-I$(GECKO_INCLUDEDIR)/docshell		\
+	-I$(GECKO_INCLUDEDIR)/dom		\
+	-I$(GECKO_INCLUDEDIR)/gfx		\
+	-I$(GECKO_INCLUDEDIR)/js		\
+	-I$(GECKO_INCLUDEDIR)/necko		\
+	-I$(GECKO_INCLUDEDIR)/string		\
+	-I$(GECKO_INCLUDEDIR)/widget		\
+	-I$(GECKO_INCLUDEDIR)/xpcom		\
+	-I$(GECKO_INCLUDEDIR)/xpconnect
 else
 libhippofirefox_la_CPPFLAGS +=			\
-	-I $(GECKO_INCLUDEDIR)			\
-	-I $(GECKO_PRIVATE_INCLUDEDIR)
+	-I$(GECKO_INCLUDEDIR)			\
+	-I$(GECKO_PRIVATE_INCLUDEDIR)
 endif
 
 nodist_libhippofirefox_la_SOURCES=			\
@@ -99,12 +99,12 @@
 
 if HAVE_FULL_GECKO
 XPIDL_INCLUDES =				\
-	-I $(GECKO_IDLDIR)			\
-	-I $(FIREFOX_SRCDIR)/public
+	-I$(GECKO_IDLDIR)			\
+	-I$(FIREFOX_SRCDIR)/public
 else
 XPIDL_INCLUDES =				\
-	-I $(GECKO_IDLDIR)			\
-	-I $(FIREFOX_SRCDIR)/public
+	-I$(GECKO_IDLDIR)			\
+	-I$(FIREFOX_SRCDIR)/public
 endif
 
 IDL_FILES =							\
--- mugshot-1.1.56/Makefile-libhippoipc.am.orig	2007-10-14 21:45:28.763275000 -0400
+++ mugshot-1.1.56/Makefile-libhippoipc.am	2007-10-14 21:45:41.432192000 -0400
@@ -3,7 +3,7 @@
 libhippoipc_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)				\
 	$(LIBHIPPOIPC_CFLAGS)			\
-	-I $(COMMONSRCDIR)/hippoipc
+	-I$(COMMONSRCDIR)/hippoipc
 libhippoipc_la_LIBADD =
 
 nodist_libhippoipc_la_SOURCES =					\
--- mugshot-1.1.56/Makefile.am.orig	2007-10-14 21:46:10.340767000 -0400
+++ mugshot-1.1.56/Makefile.am	2007-10-14 21:46:16.778737000 -0400
@@ -52,8 +52,8 @@
 
 if USE_INCLUDED_CANVAS
 CANVAS_CFLAGS =				\
-	-I $(CANVASSRCDIR)/common	\
-	-I $(CANVASSRCDIR)/linux
+	-I$(CANVASSRCDIR)/common	\
+	-I$(CANVASSRCDIR)/linux
 CANVAS_LIBADD= libhippocanvas-1.la
 
 include Makefile-libhippocanvas.am
--- mugshot-1.1.56/Makefile-mugshot.am.orig	2007-10-14 21:46:28.998151000 -0400
+++ mugshot-1.1.56/Makefile-mugshot.am	2007-10-14 21:46:37.467872000 -0400
@@ -2,7 +2,7 @@
 
 mugshot_CPPFLAGS = 			\
 	$(AM_CPPFLAGS)			\
-	-I $(top_srcdir)		\
+	-I$(top_srcdir)		\
 	$(MUGSHOT_CFLAGS)		\
 	$(CANVAS_CFLAGS)		\
        -DHOST_CPU=\"$(host_cpu)\"	\
--- mugshot-1.1.56/Makefile-libddm.am.orig	2007-10-14 21:47:00.426244000 -0400
+++ mugshot-1.1.56/Makefile-libddm.am	2007-10-14 21:47:05.261093000 -0400
@@ -6,7 +6,7 @@
 
 libddm_1_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
+	-I$(MARSHAL_DIR)		\
 	$(LIBDDM_CFLAGS)		\
 	 -DDDM_COMPILATION=1
 
--- mugshot-1.1.56/Makefile-libhippo.am.orig	2007-10-14 21:47:22.326299000 -0400
+++ mugshot-1.1.56/Makefile-libhippo.am	2007-10-14 21:47:33.719886000 -0400
@@ -2,7 +2,7 @@
 
 libhippo_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
+	-I$(MARSHAL_DIR)		\
 	$(CANVAS_CFLAGS)		\
 	$(LIBHIPPO_CFLAGS)		\
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
--- mugshot-1.1.56/Makefile-libhippocanvas.am.orig	2007-10-14 21:47:59.745090000 -0400
+++ mugshot-1.1.56/Makefile-libhippocanvas.am	2007-10-14 21:48:03.375862000 -0400
@@ -4,7 +4,7 @@
 
 libhippocanvas_1_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
+	-I$(MARSHAL_DIR)		\
 	$(CANVAS_CFLAGS)		\
 	$(LIBHIPPOCANVAS_CFLAGS)
 
--- mugshot-1.1.56/Makefile-test-hippo-ipc.am.orig	2007-10-14 21:48:15.639587000 -0400
+++ mugshot-1.1.56/Makefile-test-hippo-ipc.am	2007-10-14 21:48:23.078698000 -0400
@@ -2,7 +2,7 @@
 
 test_hippo_ipc_CPPFLAGS =		\
 	$(AM_CPPFLAGS)			\
-	-I $(COMMONSRCDIR)/hippoipc	\
+	-I$(COMMONSRCDIR)/hippoipc	\
 	$(TEST_HIPPO_IPC_CFLAGS)
 
 test_hippo_ipc_LDFLAGS=
upstream/spec-files-extra