diff options
| author | Behnam Momeni | 2015-06-24 20:13:21 +0430 |
|---|---|---|
| committer | Behnam Momeni | 2015-06-24 20:13:21 +0430 |
| commit | 9f2dd14e16c5bc0a84c76c0e1e6be2cdf774ea26 (patch) | |
| tree | d652230bf5172aaffe78d80f5abd82f693007703 /mychanges.patch | |
| parent | d38c265e0b5411d6db00502d621c0caaf8fbe969 (diff) | |
| download | aur-9f2dd14e16c5bc0a84c76c0e1e6be2cdf774ea26.tar.gz | |
Converting from split-package to normal package
As multiple cnijfilter packages are dependent on the cnijfilter-common
package and "split package" mechanism does not allow to build all of
them (with different configurations) using a single PKGBUILD, either all
of them must merge cnijfilter-common contents into their packages, which
is the worst solution, or only build their own normal packages and depend
on cnijfilter-common package, which is created from a separate PKGBUILD
itself.
Diffstat (limited to 'mychanges.patch')
| -rw-r--r-- | mychanges.patch | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/mychanges.patch b/mychanges.patch index 5d961855726d..739856d7ce50 100644 --- a/mychanges.patch +++ b/mychanges.patch @@ -263,8 +263,16 @@ diff -aur cnijfilter-source-3.20-1/cngpij/cngpij/getipc.c cnijfilter-source-3.20 break; diff -aur cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c --- cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c 2009-06-08 11:42:52.000000000 +0430 -+++ cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c 2013-07-26 00:12:36.283321388 +0430 -@@ -85,7 +85,7 @@ ++++ cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c 2015-06-24 19:26:47.455618449 +0430 +@@ -35,6 +35,7 @@ + #include <net/if.h> + #include <sys/sysctl.h> + #include <config.h> ++#include <unistd.h> + + #include <dlfcn.h> + #include "cncl.h" +@@ -85,7 +86,7 @@ /* argv[6]: modelID */ /* */ /**********************************************/ @@ -634,18 +642,20 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_sub.c cnijfilter-source-3.20-1.n else diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefile --- cnijfilter-source-3.20-1/Makefile 2009-04-06 14:19:22.000000000 +0430 -+++ cnijfilter-source-3.20-1.new/Makefile 2013-07-26 00:12:36.289987934 +0430 -@@ -14,3 +14,24 @@ ++++ cnijfilter-source-3.20-1.new/Makefile 2015-06-24 18:40:20.695615264 +0430 +@@ -14,3 +14,25 @@ install : target=install; $(scripts) -+mp550 : ++common : + for dir in "libs" "cngpij" "pstocanonij" "backend" "backendnet"; do \ + (cd $$dir; ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \ + done; \ -+ (cd lgmon; ./autogen.sh --prefix=/usr --program-suffix=mp550 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \ -+ (cd cngpijmon/cnijnpr; LIBS="-ldl" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \ -+ for dir in "ppd" "cnijfilter" "printui" "cngpijmon"; do \ ++ (cd lgmon; ./autogen.sh --prefix=/usr --program-suffix=common-general --enable-progpath=/usr/bin --libdir=/usr/lib32; cd src; make libbscc2sts.a) || exit 1; \ ++ (cd cngpijmon/cnijnpr; LIBS="-ldl" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; ++ ++mp550 : ++ for dir in "lgmon" "ppd" "cnijfilter" "printui" "cngpijmon"; do \ + (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mp550 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \ + done + @@ -827,3 +837,15 @@ diff -aur cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c cnijfilter-s return child_pid; } +diff -aur cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.20-1.new/cngpij/cngpij/bjcups.c +--- cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c 2009-06-11 08:40:32.000000000 +0430 ++++ cnijfilter-source-3.20-1.new/cngpij/cngpij/bjcups.c 2015-06-24 19:25:48.822285050 +0430 +@@ -768,7 +769,7 @@ + short canon_backend_flag = 0; + short add_bidi = 0; + short add_direct = 0; +- char *p_ppd_name; ++ const char *p_ppd_name; + ppd_file_t *p_ppd; + + |