diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-02-25 17:14:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-02-25 17:23:15 +0100 |
| commit | c7f81da78436c21a770ed73a0e0d82e0020293c3 (patch) | |
| tree | 40c298fa393476196b0325a1889bdfee01f9f1c5 /package | |
| parent | b4f81e0cb828a288880f372c03d7155dff62d470 (diff) | |
cups: update to 2.3.6
Diffstat (limited to 'package')
| -rw-r--r-- | package/cups/Makefile | 29 | ||||
| -rw-r--r-- | package/cups/patches/patch-Makedefs_in | 10 | ||||
| -rw-r--r-- | package/cups/patches/patch-configure | 14 |
3 files changed, 8 insertions, 45 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index 1f4251669..9ecb5b17f 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -4,20 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cups -PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 4 -PKG_HASH:= f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 +PKG_VERSION:= 2.3.6 +PKG_RELEASE:= 1 +PKG_HASH:= 3a96912fc88f62c5d8ac9b251bf0652f1cbe7e69cde16919103aea39f31a1a84 PKG_DESCR:= common unix printing system PKG_SECTION:= net/misc PKG_DEPENDS:= zlib -PKG_BUILDDEP:= cups-host zlib -PKG_NEEDS:= threads c++ +PKG_BUILDDEP:= zlib +PKG_NEEDS:= threads c++ iconv PKG_URL:= http://www.cups.org/ -PKG_SITES:= http://www.cups.org/software/${PKG_VERSION}/ +PKG_SITES:= https://github.com/apple/cups/archive/refs/tags/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 +DISTFILES:= v${PKG_VERSION}.tar.gz include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -25,35 +24,25 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq ($(ADK_PACKAGE_LIBICONV),y) -TARGET_LDFLAGS+= -liconv -endif - ifneq ($(ADK_HOST_LINUX),y) HOST_LINUX_ONLY:= 1 endif -HOST_LDFLAGS+= -liconv HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --disable-webif \ --disable-gssapi \ --disable-avahi \ --disable-pam \ --disable-dbus \ - --without-java \ - --without-perl \ - --without-python \ - --without-php \ --disable-gnutls \ - --disable-openssl \ --disable-cdsassl \ --disable-dbus \ --disable-ssl \ + --disable-systemd \ --with-components=core \ --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC -std=c89' LSB_BUILD=y - CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ --libdir=/usr/lib \ @@ -76,8 +65,6 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --with-components=core \ --with-rcdir=$(STAGING_TARGET_DIR)/etc -FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" - cups-install: ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ diff --git a/package/cups/patches/patch-Makedefs_in b/package/cups/patches/patch-Makedefs_in deleted file mode 100644 index 1a8f91894..000000000 --- a/package/cups/patches/patch-Makedefs_in +++ /dev/null @@ -1,10 +0,0 @@ ---- cups-1.7.1.orig/Makedefs.in 2013-07-17 17:21:18.000000000 +0200 -+++ cups-1.7.1/Makedefs.in 2014-01-31 08:40:55.000000000 +0100 -@@ -238,7 +238,6 @@ DBUSDIR = @DBUSDIR@ - # Rules... - # - --.SILENT: - .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz - - .c.o: diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure deleted file mode 100644 index 3a4974140..000000000 --- a/package/cups/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- cups-1.7.1.orig/configure 2014-01-08 17:26:27.000000000 +0100 -+++ cups-1.7.1/configure 2014-01-31 16:48:50.000000000 +0100 -@@ -2490,9 +2490,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --uname=`uname` --uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'` --uarch=`uname -m` -+uname=Linux -+uversion=3.0 - - case "$uname" in - Darwin*) |