Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (d084623f6a116b63eb1d2ed0a29353f4c3a01162)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d084623f6a116b63eb1d2ed0a29353f4c3a01162)
  • Date: Sat, 24 Jun 2006 06:10:09 -0500

GIT changes to master grimoire by George Sherwood <pilot AT sourcemage.org>:

dev/null |binary
printer/cups/DETAILS | 3 --
printer/cups/HISTORY | 7 +++++
printer/cups/Makefile.diff | 33
----------------------------
printer/cups/PRE_BUILD | 6 -----
printer/cups/cups-1.1.23-source.tar.bz2.sig | 0
printer/cups/cups-1.2.1-source.tar.bz2.sig |binary
printer/cups/xpdf-pl3.patch | 13 -----------
8 files changed, 8 insertions(+), 54 deletions(-)

New commits:
commit d084623f6a116b63eb1d2ed0a29353f4c3a01162
Author: George Sherwood <pilot AT sourcemage.org>
Commit: George Sherwood <pilot AT sourcemage.org>

Version update to 1.2.1. Removed unneeded patches. Compiles with gcc
4.0.3 now.

diff --git a/printer/cups/DETAILS b/printer/cups/DETAILS
index 4ec9b04..8b89915 100755
--- a/printer/cups/DETAILS
+++ b/printer/cups/DETAILS
@@ -1,5 +1,5 @@
SPELL=cups
- VERSION=1.1.23
+ VERSION=1.2.1
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.easysw.com/pub/${SPELL}/$VERSION/$SOURCE
## Oregon, USA
@@ -13,7 +13,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
UPDATED=20050221
LICENSE[0]=http://www.cups.org/faq0003.html
BUILD_API=2
- GCC_VERSION=3.4
KEYWORDS="printer"
SHORT="Common Unix Printing System is a portable printing layer"
cat << EOF
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 8a588ee..96e6cd6 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,10 @@
+2006-06-24 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.2.1. Removed GCC_VERSION.
+ Works with 4.0.3
+ * xpdf-pl3.patch: Removed. Not needed.
+ * Makefile.diff: Removed. Not needed.
+ * PRE_BUILD: Removed. Patches not required.
+
2006-06-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: removed the conflict managment
* CONFLICTS: readded
diff --git a/printer/cups/Makefile.diff b/printer/cups/Makefile.diff
deleted file mode 100644
index 2d1349e..0000000
--- a/printer/cups/Makefile.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.old 2003-05-27 21:52:27.000000000 -0700
-+++ Makefile 2003-05-27 21:52:49.000000000 -0700
-@@ -89,30 +89,6 @@
- echo Installing cups-config script...
- $(INSTALL_DIR) $(BINDIR)
- $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-- echo Installing startup script...
-- if test "x$(INITDIR)" != "x"; then \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups;
\
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-- fi
-- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
-- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-- if test "$(INITDDIR)" =
"/System/Library/StartupItems/PrintingServices"; then \
-- $(INSTALL_SCRIPT) cups.osx
$(BUILDROOT)$(INITDDIR)/PrintingServices; \
-- $(INSTALL_DATA) cups.plist
$(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-- $(INSTALL_DIR)
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-- $(INSTALL_DATA) cups.strings
$(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-- else \
-- $(INSTALL_SCRIPT) cups.sh
$(BUILDROOT)$(INITDDIR)/cups; \
-- fi \
-- fi
-
- #
- # Install source and header files...
diff --git a/printer/cups/PRE_BUILD b/printer/cups/PRE_BUILD
deleted file mode 100755
index 9e10ad4..0000000
--- a/printer/cups/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/xpdf-pl3.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.diff
-
diff --git a/printer/cups/cups-1.1.23-source.tar.bz2.sig
b/printer/cups/cups-1.1.23-source.tar.bz2.sig
deleted file mode 100644
index 5ebe8fb..0000000
Binary files a/printer/cups/cups-1.1.23-source.tar.bz2.sig and /dev/null
differ
diff --git a/printer/cups/cups-1.2.1-source.tar.bz2.sig
b/printer/cups/cups-1.2.1-source.tar.bz2.sig
new file mode 100644
index 0000000..afa8e04
Binary files /dev/null and b/printer/cups/cups-1.2.1-source.tar.bz2.sig differ
diff --git a/printer/cups/xpdf-pl3.patch b/printer/cups/xpdf-pl3.patch
deleted file mode 100644
index a21729f..0000000
--- a/printer/cups/xpdf-pl3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur cups-1.1.23.orig/pdftops/XRef.cxx cups-1.1.23/pdftops/XRef.cxx
---- cups-1.1.23.orig/pdftops/XRef.cxx 2005-02-22 10:27:40.025289672 -0800
-+++ cups-1.1.23/pdftops/XRef.cxx 2005-02-22 10:27:57.643611280 -0800
-@@ -527,6 +527,9 @@
- } else {
- keyLength = 5;
- }
-+ if (keyLength > 16) {
-+ keyLength = 16;
-+ }
- permFlags = permissions.getInt();
- if (encVersion >= 1 && encVersion <= 2 &&
- encRevision >= 2 && encRevision <= 3) {




Archive powered by MHonArc 2.6.24.

Top of Page