Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9cb2233b93b41570cf318e313a9cb22aa273516a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9cb2233b93b41570cf318e313a9cb22aa273516a)
  • Date: Thu, 22 Jun 2006 11:19:09 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

dev/null |binary
kernels/ndiswrapper/DETAILS | 5 +---
kernels/ndiswrapper/HISTORY | 3 ++
printer/espgs/BUILD | 5 ++--
printer/espgs/CONFIGURE | 9 ++++++++
printer/espgs/DEPENDS | 17 +++------------
printer/espgs/DETAILS | 13 +++++-------
printer/espgs/HISTORY | 27
++++++++++++++++++++++++-
printer/espgs/INSTALL | 22 +++++++++++++++++---
printer/espgs/PRE_BUILD | 15 +++++++++----
printer/espgs/espgs-8.15.1-source.tar.bz2.sig | 0
printer/espgs/ghostscript-8.15-sharedlib.patch | 18 ++++++++++++++++
12 files changed, 100 insertions(+), 34 deletions(-)

New commits:
commit 9cb2233b93b41570cf318e313a9cb22aa273516a
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

espgs - minor fix to CONFIGURE

commit 9e731449522270480734b69b3ff9e963d641ab64
Merge: 4d691e6363955aee3c5f85ad550948c3029b643f
b6424787278a88140e1e24b67e4162cc40443c51
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

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

commit 4d691e6363955aee3c5f85ad550948c3029b643f
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

ndiswrapper-1.18

commit 23a04973e5971c6cdd20b340754047b0979ee2c9
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

espgs-8.15.2 (rather delayed)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/kernels/ndiswrapper/DETAILS b/kernels/ndiswrapper/DETAILS
index 8737cae..90a8f80 100755
--- a/kernels/ndiswrapper/DETAILS
+++ b/kernels/ndiswrapper/DETAILS
@@ -1,7 +1,6 @@
SPELL=ndiswrapper
- VERSION=1.17
- BUILD_API=2
-
SOURCE_HASH=sha512:fd37dc38b966b22a3cff1a77b5b67d96d9e3c9781896ee0be470cab309ad2f637632511ad641321b8f1c97e56700eeaef25d758afb9bb8c31112df822615e60d
+ VERSION=1.18
+
SOURCE_HASH=sha512:b57e5097cc2fb771487b0f60cfc7907614a7daa8e8bf1f207f5325cc907fdb13e0daccb814f671aa0ccc935835a7bc26826ecc16d00b9297b4cb0010f5f7ce7a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 6064b01..ffd339e 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,6 @@
+2006-06-22 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: upgrade to 1.18
+
2006-06-05 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: upgrade to 1.17
* BUILD: added back, now works correctly
diff --git a/printer/espgs/BUILD b/printer/espgs/BUILD
index 024b245..99b5e16 100755
--- a/printer/espgs/BUILD
+++ b/printer/espgs/BUILD
@@ -1,5 +1,6 @@
-OPTS="--enable-dynamic \
- $OPTS" &&
+# need a comma separated list
+OPTS="--with-drivers=`echo ${ESPGS_PRINTERS} |sed "s/^ *//;s/ /,/g"`,FILES \
+ --enable-dynamic ${OPTS}" &&

make_single &&
default_build &&
diff --git a/printer/espgs/CONFIGURE b/printer/espgs/CONFIGURE
new file mode 100755
index 0000000..f742103
--- /dev/null
+++ b/printer/espgs/CONFIGURE
@@ -0,0 +1,9 @@
+config_query ESPGS_LIBGS "Install libgs.so, used by gsview and others,
requires GTK+?" n
+config_query ESP_SEL "Do you wish to select printer types?" n
+if [[ -z ${ESPGS_PRINTERS} ]] || [[ ${ESP_SEL} == y ]]; then
+ persistent_remove ESPGS_PRINTERS
+fi
+source $GRIMOIRE/FUNCTIONS
+config_query_multi ESPGS_PRINTERS "Please select printer types" \
+ ALL APPLE BROTHER CANON EPSON HP IBM JAPAN LEXMARK OKI PCLXL
+persistent_remove ESP_SEL
diff --git a/printer/espgs/DEPENDS b/printer/espgs/DEPENDS
index 748c6b2..9e5396f 100755
--- a/printer/espgs/DEPENDS
+++ b/printer/espgs/DEPENDS
@@ -5,20 +5,11 @@ depends libpng &&
depends tiff &&
depends X11-LIBS &&
depends zlib &&
-depends glib2 $$
-#if [ "$ESPGS_OMNI" == "y" ]; then
-# depends glib2
-#fi &&
+depends glib2 &&

-#optional_depends X11-LIBS \
-# '' \
-# '' \
-# 'for X11 GUI support' &&
-
-#optional_depends "gtk+"
\
-# "--with-x --x-libraries=/usr/X11/lib/"
\
-# ""
\
-# "for the Ghostscript display device so you can preview PS
and PDF files on your screen" &&
+if [ "${ESPGS_LIBGS}" == "y" ]; then
+ depends gtk+
+fi &&

optional_depends "cups" \
"--enable-cups" \
diff --git a/printer/espgs/DETAILS b/printer/espgs/DETAILS
index 77cbaac..e1b2c1a 100755
--- a/printer/espgs/DETAILS
+++ b/printer/espgs/DETAILS
@@ -1,5 +1,6 @@
SPELL=espgs
- VERSION=8.15.1
+ VERSION=8.15.2
+
SOURCE_HASH=sha512:0898bc3d1286b194d8540676b59adc25767b4ff59d2880dd5ae7cbcdad94ecc22a8dc790138434923664d96cadf6af882aad98864e933f16a6d8da9cb9473992
SOURCE=${SPELL}-${VERSION}-source.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://ftp.easysw.com/pub/ghostscript/${VERSION}/${SOURCE}
## Oregon, USA
@@ -9,15 +10,13 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP

SOURCE_URL[4]=ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/${VERSION}/${SOURCE}
## Braunschweig, Germany
WEB_SITE=http://www.cups.org
LICENSE[0]=GPL
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- BUILD_API=2
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
ENTERED=20020613
- UPDATED=20040402
if [ "$ESPGS_OMNI" = "y" ]; then
- SOURCE4=Omni-0.9.2.tar.gz
- SOURCE4_URL[0]=${SOURCEFORGE_URL}/omniprint/${SOURCE4}
+ SOURCE2=Omni-0.9.2.tar.gz
+ SOURCE2_URL[0]=${SOURCEFORGE_URL}/omniprint/${SOURCE4}
LICENSE[3]=LGPL
- SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig"
+ SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
fi
KEYWORDS="ghostscript interpreter postscript printer"
SHORT="ESP Ghostscript is an interpreter for the PostScript
langauge."
diff --git a/printer/espgs/HISTORY b/printer/espgs/HISTORY
index e769b24..8393fb9 100644
--- a/printer/espgs/HISTORY
+++ b/printer/espgs/HISTORY
@@ -1,5 +1,30 @@
+2006-06-22 Treeve Jelbert <treeve01 AT pi.be>
+ * CONFIGURE: source FUNCTIONS, not config_query_multi
+
+2006-04-26 Treeve Jelbert <treeve01 AT pi.be>
+ * CONFIGURE: fix typo s/R/r/
+ add overlooked PCLXL printers
+ always unset ESP_SEL
+
+2006-04-26 Treeve Jelbert <treeve01 AT pi.be>
+ * BUILD CONFIGURE: allow selection of printer types
+ * INSTALL: remove hard-coded version numbers
+
+2006-04-25 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 8.15.2
+
+2006-04-09 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added to query libgs.so install
+ * DEPENDS: set gtk+ depends on query
+ * PRE_BUILD: add sedit to change default output device
+ added patch to build libgs
+ * BUILD: remove un-needed line continuation
+ * INSTALL: run libgs make and make soinstall by query
+ install any missing docs and link as BLFS
+ * WIP: added
+
2006-04-09 Robin Cook <rcook AT wyrms.net>
- * DETAILS: changed to gpg on Omni as kept getting invalid hash
+ * DETAILS: changed to gpg on Omni as kept getting invalid hash

2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/printer/espgs/INSTALL b/printer/espgs/INSTALL
index 53237c6..f80c2d6 100755
--- a/printer/espgs/INSTALL
+++ b/printer/espgs/INSTALL
@@ -1,8 +1,24 @@
default_install &&

+ln -v -s ../ghostscript/8.15/doc /usr/share/doc/espgs-${VERSION} &&
+
+for INSTFILE in `ls doc`
+do
+ if [ ! -f /usr/share/doc/espgs-${VERSION}/${INSTFILE} ]; then
+ install -v -m644 doc/${INSTFILE} /usr/share/doc/espgs-${VERSION}/
+ fi
+done &&
+
+if [ "${ESPGS_LIBGS}" == "y" ]; then
+ make_single &&
+ make CFLAGS='-fpic $(ACDEFS)' so &&
+ make soinstall &&
+ make_normal
+fi &&
+
#
# Install header files
#
-ESPGS_INCLUDE_DIR=$INSTALL_ROOT/usr/include/$SPELL &&
-mkdir -p $ESPGS_INCLUDE_DIR &&
-cp src/*.h $ESPGS_INCLUDE_DIR
+ESPGS_INCLUDE_DIR=${INSTALL_ROOT}/usr/include/$SPELL &&
+mkdir -p ${ESPGS_INCLUDE_DIR} &&
+cp src/*.h ${ESPGS_INCLUDE_DIR}
diff --git a/printer/espgs/PRE_BUILD b/printer/espgs/PRE_BUILD
index b90b06d..96ed10c 100755
--- a/printer/espgs/PRE_BUILD
+++ b/printer/espgs/PRE_BUILD
@@ -1,11 +1,16 @@
-default_pre_build &&
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&

-cd "$SOURCE_DIRECTORY" &&
# this operation is harmless because because rpl_malloc is not defined
anywhere
# in the source; moreover, the symbol HAVE_MALLOC is not used in the source
as
# of ESPGS 8.15.1 and maybe earlier.
-sedit 's|#define malloc rpl_malloc|//\0|g' configure &&
+sedit 's|#define malloc rpl_malloc|//\0|g' configure &&

-if [[ -n "$SOURCE4" ]]; then
+if [ "${ESPG_OMNI}" == "y" ]; then
unpack_file 4
-fi
+fi
+
+if [ "${ESPGS_LIBGS}" == "y" ]; then
+ sedit "s/bbox.dev$/x11.dev/" Makefile.in &&
+ patch -p1 < ${SCRIPT_DIRECTORY}/ghostscript-8.15-sharedlib.patch
+fi
diff --git a/printer/espgs/espgs-8.15.1-source.tar.bz2.sig
b/printer/espgs/espgs-8.15.1-source.tar.bz2.sig
deleted file mode 100644
index 5df43da..0000000
Binary files a/printer/espgs/espgs-8.15.1-source.tar.bz2.sig and /dev/null
differ
diff --git a/printer/espgs/ghostscript-8.15-sharedlib.patch
b/printer/espgs/ghostscript-8.15-sharedlib.patch
new file mode 100644
index 0000000..12304f9
--- /dev/null
+++ b/printer/espgs/ghostscript-8.15-sharedlib.patch
@@ -0,0 +1,18 @@
+--- 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 Treeve Jelbert (9cb2233b93b41570cf318e313a9cb22aa273516a), Treeve Jelbert, 06/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page