Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b1e6b1ddf15395772c13b0a025b3726e3e9ba4b2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b1e6b1ddf15395772c13b0a025b3726e3e9ba4b2)
  • Date: Sat, 24 Jun 2006 14:44:40 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

printer/espgs/HISTORY | 3 +++
printer/espgs/PRE_BUILD | 3 +--
printer/espgs/ghostscript-8.15-sharedlib.patch | 18 ------------------
3 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit b1e6b1ddf15395772c13b0a025b3726e3e9ba4b2
Merge: ee6cf11e901849ec9f4be6ce886d19d10b06f55b
e7af73a2282f16f537fe0d8ffb9b2d6ce559aaca
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Merge branch 'master' of http://scm.sourcemage.org/smgl/grimoire

Conflicts:

printer/espgs/HISTORY

commit ee6cf11e901849ec9f4be6ce886d19d10b06f55b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

espgs: removed ghostscript-8.15-sharedlib.patch, already included in
8.15.2

diff --git a/printer/espgs/HISTORY b/printer/espgs/HISTORY
index ff6c44e..fa5b769 100644
--- a/printer/espgs/HISTORY
+++ b/printer/espgs/HISTORY
@@ -1,3 +1,6 @@
+2006-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, ghostscript-8.15-sharedlib.patch: removed, included in
8.15.2
+
2006-06-24 Treeve Jelbert <treeve01 AT pi.be>
* CONFIGURE: simplify query for printer selection
should fix bug #12734
diff --git a/printer/espgs/PRE_BUILD b/printer/espgs/PRE_BUILD
index 96ed10c..c3ec43e 100755
--- a/printer/espgs/PRE_BUILD
+++ b/printer/espgs/PRE_BUILD
@@ -11,6 +11,5 @@ if [ "${ESPG_OMNI}" == "y" ]; then
fi

if [ "${ESPGS_LIBGS}" == "y" ]; then
- sedit "s/bbox.dev$/x11.dev/" Makefile.in &&
- patch -p1 < ${SCRIPT_DIRECTORY}/ghostscript-8.15-sharedlib.patch
+ sedit "s/bbox.dev$/x11.dev/" Makefile.in
fi
diff --git a/printer/espgs/ghostscript-8.15-sharedlib.patch
b/printer/espgs/ghostscript-8.15-sharedlib.patch
deleted file mode 100644
index 12304f9..0000000
--- a/printer/espgs/ghostscript-8.15-sharedlib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- espgs/src/unix-dll.mak.orig 2006-01-30 11:48:17.000000000 -0200
-+++ espgs/src/unix-dll.mak 2006-01-30 11:48:51.000000000 -0200
-@@ -87,13 +87,13 @@
-
- # Normal shared object
- so: SODIRS
-- $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS)
$(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-+ $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS)
$(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-
- # Debug shared object
- # Note that this is in the same directory as the normal shared
- # object, so you will need to use 'make soclean', 'make sodebug'
- sodebug: SODIRS
-- $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG)
$(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
-+ $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG)
$(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
-
- install-so: so
- -mkdir -p $(prefix)



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b1e6b1ddf15395772c13b0a025b3726e3e9ba4b2), Jaka Kranjc, 06/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page