summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
-rw-r--r--buildfiles.patch63
3 files changed, 68 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab764617b48e..ceb2c9414681 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,9 +14,11 @@ pkgbase = cnijfilter-mx920
depends = cnijfilter-common=4.00
source = http://gdlp01.c-wss.com/gds/1/0100005171/01/cnijfilter-source-3.90-1.tar.gz
source = cups.patch
+ source = buildfiles.patch
source = mychanges.patch
sha512sums = 9ec303dc7209f5534a20e533fc18ec810603f4515655ce67f28f0f35d521185181351fd866d2191939eb02c783b168f637e18888a4e6a1eacc9e93b1b656ebcb
sha512sums = af0de981c5610f4001b5ab4d6fb042f48879995c1e1434fa3819e02d2030ceaf35b183f8cbab530435af6d452bb88c23e522c51d20e9cb5c81a7ff6a4c2df915
+ sha512sums = 9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2
sha512sums = 1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182
depends_i686 = gtk2
depends_i686 = libxml2
diff --git a/PKGBUILD b/PKGBUILD
index 154991eb4b37..069ff9e53cd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,9 +28,11 @@ install=cnijfilter-mx920.install
source=("http://gdlp01.c-wss.com/gds/1/0100005171/01/cnijfilter-source-3.90-1.tar.gz"
"cups.patch"
+ "buildfiles.patch"
"mychanges.patch")
sha512sums=('9ec303dc7209f5534a20e533fc18ec810603f4515655ce67f28f0f35d521185181351fd866d2191939eb02c783b168f637e18888a4e6a1eacc9e93b1b656ebcb'
'af0de981c5610f4001b5ab4d6fb042f48879995c1e1434fa3819e02d2030ceaf35b183f8cbab530435af6d452bb88c23e522c51d20e9cb5c81a7ff6a4c2df915'
+ '9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2'
'1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182')
prepare() {
@@ -39,6 +41,7 @@ prepare() {
cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}
patch -p1 -i ${srcdir}/cups.patch
+ patch -p1 -i ${srcdir}/buildfiles.patch
patch -p1 -i ${srcdir}/mychanges.patch
}
diff --git a/buildfiles.patch b/buildfiles.patch
new file mode 100644
index 000000000000..6cd4846f7f73
--- /dev/null
+++ b/buildfiles.patch
@@ -0,0 +1,63 @@
+diff -ruN cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am cnijfilter-source-4.00-1/lgmon2/src/Makefile.am
+--- cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am 2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/lgmon2/src/Makefile.am 2015-08-04 12:35:12.115634249 +0430
+@@ -9,3 +9,4 @@
+ CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@
+
+ cnijlgmon2_LDADD = -ldl -lusb-1.0 -lcnnet -lxml2
++cnijlgmon2_LDFLAGS = -L../../com/libs_bin32
+diff -ruN cnijfilter-source-4.00-1.orig/Makefile cnijfilter-source-4.00-1/Makefile
+--- cnijfilter-source-4.00-1.orig/Makefile 2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/Makefile 2015-08-04 13:02:47.675636146 +0430
+@@ -14,3 +14,12 @@
+ install :
+ target=install; $(scripts)
+
++common :
++ for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
++ (cd $$dir; ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib32/bjlib --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
++ done
++
++installcommon :
++ for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
++ (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
++ done
+diff -ruN cnijfilter-source-4.00-1.orig/backendnet/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
+--- cnijfilter-source-4.00-1.orig/backendnet/configure.in 2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/backendnet/configure.in 2015-08-04 16:54:42.385652052 +0430
+@@ -19,7 +19,8 @@
+ AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
+ AC_SUBST(BJLIB_PATH)
+
+-ARC=`getconf LONG_BIT`
++#ARC=`getconf LONG_BIT`
++ARC=32
+ AC_SUBST(ARC)
+
+ # Checks for programs.
+diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-source-4.00-1/cnijfilter/configure.in
+--- cnijfilter-source-4.00-1.orig/cnijfilter/configure.in 2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/cnijfilter/configure.in 2015-08-04 16:55:56.955652143 +0430
+@@ -43,7 +43,8 @@
+ esac
+ AC_SUBST(CNCL_LIB_ID)
+
+-ARC=`getconf LONG_BIT`
++#ARC=`getconf LONG_BIT`
++ARC=32
+ AC_SUBST(ARC)
+
+ AC_PROG_CC
+diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/configure.in cnijfilter-source-4.00-1/cnijnpr/configure.in
+--- cnijfilter-source-4.00-1.orig/cnijnpr/configure.in 2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/cnijnpr/configure.in 2015-08-04 16:56:07.878985490 +0430
+@@ -37,7 +37,8 @@
+
+ CFLAGS="-O2"
+
+-ARC=`getconf LONG_BIT`
++#ARC=`getconf LONG_BIT`
++ARC=32
+ AC_SUBST(ARC)
+
+ AC_OUTPUT(Makefile