aboutsummaryrefslogtreecommitdiffstats
path: root/packages/cups
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/cups
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/cups')
-rw-r--r--packages/cups/cups-1.1.23/strftime_fix.patch26
-rw-r--r--packages/cups/cups-1.3.8/use_echo_only_in_init.patch11
-rw-r--r--packages/cups/cups.inc87
-rw-r--r--packages/cups/cups_1.1.23.bb47
-rw-r--r--packages/cups/cups_1.2.12.bb2
-rw-r--r--packages/cups/cups_1.2.7.bb76
-rw-r--r--packages/cups/cups_1.3.8.bb8
7 files changed, 0 insertions, 257 deletions
diff --git a/packages/cups/cups-1.1.23/strftime_fix.patch b/packages/cups/cups-1.1.23/strftime_fix.patch
deleted file mode 100644
index 81f224fa2e..0000000000
--- a/packages/cups/cups-1.1.23/strftime_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: cups-1.1.23/scheduler/classes.c
-===================================================================
---- cups-1.1.23.orig/scheduler/classes.c
-+++ cups-1.1.23/scheduler/classes.c
-@@ -622,7 +622,7 @@ SaveAllClasses(void)
-
- curtime = time(NULL);
- curdate = localtime(&curtime);
-- strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
-+ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
-
- cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
- cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-Index: cups-1.1.23/scheduler/printers.c
-===================================================================
---- cups-1.1.23.orig/scheduler/printers.c
-+++ cups-1.1.23/scheduler/printers.c
-@@ -1066,7 +1066,7 @@ SaveAllPrinters(void)
-
- curtime = time(NULL);
- curdate = localtime(&curtime);
-- strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
-+ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
-
- cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
- cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
diff --git a/packages/cups/cups-1.3.8/use_echo_only_in_init.patch b/packages/cups/cups-1.3.8/use_echo_only_in_init.patch
deleted file mode 100644
index 21ff0e535b..0000000000
--- a/packages/cups/cups-1.3.8/use_echo_only_in_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300
-+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300
-@@ -68,7 +68,7 @@
- ECHO_ERROR=:
- ;;
-
-- Linux*)
-+ DISABLELinux*)
- IS_ON=/bin/true
- if test -f /etc/init.d/functions; then
- . /etc/init.d/functions
diff --git a/packages/cups/cups.inc b/packages/cups/cups.inc
deleted file mode 100644
index bbf2377ced..0000000000
--- a/packages/cups/cups.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
-
-SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
-
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-
- # This directory gets installed with perms 511, which makes packaging fail
- chmod 0711 "${D}/${localstatedir}/run/cups/certs"
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-python do_package_append() {
- # Change permissions back the way they were, they probably had a reason...
- workdir = bb.data.getVar('WORKDIR', d, 1)
- os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
-}
-
-PACKAGES =+ "${PN}-lib ${PN}-libimage"
-
-FILES_${PN}-lib = "${libdir}/libcups.so.*"
-
-FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
-
diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
deleted file mode 100644
index b17d899a3d..0000000000
--- a/packages/cups/cups_1.1.23.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "openssl jpeg libpng zlib install-native fakeroot-native"
-PR = "r6"
-
-SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- file://strftime_fix.patch;patch=1"
-
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-do_compile () {
- #Eeeks! Hack alert!
- grep CUPS config.h.in~ | grep define >> config.h
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- oe_runmake "SSLLIBS=-lssl -lcrypto -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- "
-
-
-
-
diff --git a/packages/cups/cups_1.2.12.bb b/packages/cups/cups_1.2.12.bb
deleted file mode 100644
index bbe3c5d84f..0000000000
--- a/packages/cups/cups_1.2.12.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require cups.inc
-PR = "r1"
diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb
deleted file mode 100644
index 24249fa3b1..0000000000
--- a/packages/cups/cups_1.2.7.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
-PR = "r1"
-
-SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
-
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
-
-
-
-
diff --git a/packages/cups/cups_1.3.8.bb b/packages/cups/cups_1.3.8.bb
deleted file mode 100644
index e9fd9850e9..0000000000
--- a/packages/cups/cups_1.3.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require cups.inc
-
-SRC_URI += "file://use_echo_only_in_init.patch;patch=1"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += " --disable-gssapi "