November 2016 - crux-commits

ports/opt (3.3): deadwood: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 09089fc06b6ecfa1e719aaac327ad39fa604e1c3 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:19:22 2016 +0100 deadwood: move man-pages to /usr/share/man diff --git a/deadwood/.footprint b/deadwood/.footprint index 4c53f4b..4bd9fdd 100644 --- a/deadwood/.footprint +++ b/deadwood/.footprint @@ -3,11 +3,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/deadwood drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/deadwood.1.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/Deadwood +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/deadwood.1.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/deadwood/ diff --git a/deadwood/.signature b/deadwood/.signature index b802ee0..8e32ac5 100644 --- a/deadwood/.signature +++ b/deadwood/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QYw07Nv4TO12eH0CxYxZ8igK2G7cb3OUG0ukJ/DUFM0fjdQWHzG4ihWzs1NX9vBKkv/upL4Hc0WKmQVSwdzKAs= -SHA256 (Pkgfile) = 381882fc21b93e02dbfcc1023bf3d0d52aa9c2eac4304fd3c12d596cdd0bddc5 -SHA256 (.footprint) = 43e4182e2269c19162352f00d1a1c412736be0c0a786fb0b89d466b745fec65e +RWSE3ohX2g5d/ejVRuLcHPUWGaQolGzOoEq1qh7rLKhHqgzchDMITJWrM4jE/OPbaG9DfFIs0DEQgtwj/2AloAepkBDHQHlIlQw= +SHA256 (Pkgfile) = a8b870af23282ed1cdf4aa457c6760f1de9ebebc1052e0158b43a53c8b51275f +SHA256 (.footprint) = c8d916f21b2796115656b1b5337f4fa2a9db6bd1bcc5afbafa5d85c54201dce6 SHA256 (deadwood-3.2.09.tar.xz) = 0a3bf9f3976712e390c92f241606fbd7efbe761631ff7c19414ca0227cebf367 SHA256 (dwood3rc) = 358f8d6f195ecfa9823105233620be91a8a67da686322a41ea1f292069613216 SHA256 (deadwood) = b50eb7d4de77dc16282f7c4d542a08ba3f706244ca71b164d58dcb8aac995eeb diff --git a/deadwood/Pkgfile b/deadwood/Pkgfile index 8c8dc0d..51c6172 100644 --- a/deadwood/Pkgfile +++ b/deadwood/Pkgfile @@ -4,7 +4,7 @@ name=deadwood version=3.2.09 -release=1 +release=2 source=(http://maradns.samiam.org/deadwood/stable/$name-$version.tar.xz \ dwood3rc deadwood) @@ -13,10 +13,10 @@ build () { make -C src FLAGS="$CFLAGS" - install -d $PKG/{usr/sbin,usr/man/man1,etc/rc.d,var/lib/deadwood} + install -d $PKG/{usr/sbin,usr/share/man/man1,etc/rc.d,var/lib/deadwood} install -d -m 700 -o nobody $PKG/var/lib/deadwood/cache install -m 755 src/Deadwood $PKG/usr/sbin - install -m 644 doc/Deadwood.1 $PKG/usr/man/man1/deadwood.1 + install -m 644 doc/Deadwood.1 $PKG/usr/share/man/man1/deadwood.1 install -m 644 $SRC/dwood3rc $PKG/etc install -m 755 $SRC/deadwood $PKG/etc/rc.d }

1 0

ports/opt (3.3): conky: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 9062ba691252ec4f36da401633faeb708cf88ffe Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:17:48 2016 +0100 conky: move man-pages to /usr/share/man diff --git a/conky/.footprint b/conky/.footprint index 81df1f1..ba1f6e8 100644 --- a/conky/.footprint +++ b/conky/.footprint @@ -5,6 +5,7 @@ drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/conky/ -rw-r--r-- root/root usr/etc/conky/conky.conf -rw-r--r-- root/root usr/etc/conky/conky_no_x11.conf -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/conky.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/conky.1.gz diff --git a/conky/.signature b/conky/.signature index 1d07f16..d7b8f1a 100644 --- a/conky/.signature +++ b/conky/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/apx85brYIJaFoIN7r0S3u7nYisXQHV+XS2RhdaD5VCMvHkfvCAq9lRmutMw641liZqc2qQvq7J+jEk+hFo43wQ= -SHA256 (Pkgfile) = f3871cd1bd8a20b6a99a39b47c520d4dadf6dcb836fd12142d1d3fd1ad1b73eb -SHA256 (.footprint) = 5dc57cbe815b6d41248a29f400e9378cb13b4a47606c2de66bf280acfa0ff4cf +RWSE3ohX2g5d/Uv5/N11GVW+k+zw7u0ZVNVOBdPC75v+xNds/l63O0vHyf/w1ZPIt+VQc5rYIm5JWQ3bcJyDOyfRKd9atXtwRg8= +SHA256 (Pkgfile) = 20ba76430bc77e18e6f53ad1a48959640ce3d18a0c052357255607fe3f47e4c1 +SHA256 (.footprint) = ff8a08c65f5f2c3959c9323c8efb3c3c5d23fd802931a7c76091309aabe7bef0 SHA256 (conky-1.9.0.tar.bz2) = baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f diff --git a/conky/Pkgfile b/conky/Pkgfile index 0c69816..a597f65 100644 --- a/conky/Pkgfile +++ b/conky/Pkgfile @@ -5,13 +5,12 @@ name=conky version=1.9.0 -release=1 +release=2 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name… build() { cd $name-$version ./configure --prefix=/usr \ - --mandir=/usr/man \ --disable-lua \ --enable-xft \ --enable-portmon \

1 0

ports/opt (3.3): cdparanoia: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 048100a6908626180b1dedf056b8f3ed41da795f Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:16:11 2016 +0100 cdparanoia: move man-pages to /usr/share/man diff --git a/cdparanoia/.footprint b/cdparanoia/.footprint index 6264040..640088c 100644 --- a/cdparanoia/.footprint +++ b/cdparanoia/.footprint @@ -14,6 +14,7 @@ lrwxrwxrwx root/root usr/lib/libcdda_interface.so.0 -> libcdda_interface.so.0.10 lrwxrwxrwx root/root usr/lib/libcdda_paranoia.so -> libcdda_paranoia.so.0.10.2 lrwxrwxrwx root/root usr/lib/libcdda_paranoia.so.0 -> libcdda_paranoia.so.0.10.2 -rw-r--r-- root/root usr/lib/libcdda_paranoia.so.0.10.2 -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/cdparanoia.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/cdparanoia.1.gz diff --git a/cdparanoia/.signature b/cdparanoia/.signature index a1868e2..3dbb815 100644 --- a/cdparanoia/.signature +++ b/cdparanoia/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/azfF60QcPX68VS0J9ZrjRnbk1ovGzbLg+u+QRowHuOI0hFJLAnASU5fjfhtYYpxgI7YMYsrNjYWqiPGAAYbsws= -SHA256 (Pkgfile) = ffc6919ef12d85d1806c73224d6feeb16c60a80fb0c22d3bb40fe59af15757fe -SHA256 (.footprint) = d0384df55c18b4a52f88188381b380d04dceeb281ad8adcfee42458cfe911610 +RWSE3ohX2g5d/fqiNXOnnvbU/QagO2rEJyDHXWg1r+JUV0v7z9uMsAoL631incIPnTtLmSzcnBkasaGTUw/1RxN5BD2t3lB/wA0= +SHA256 (Pkgfile) = 6b7ce89f4acf38d2f09ad5a7cd97bc57aae5f46e285a332b53ce9033642bd77b +SHA256 (.footprint) = e100802f21eb9875ebf2dbe0a3cef857b3661bf4dc5ba878fd5a85642a0ba7a9 SHA256 (cdparanoia-III-10.2.src.tgz) = 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df SHA256 (cdparanoia-10.2-gcc43.patch) = d055d86056809dee6e861af77d766fb0f17084bb19e44d9d99be8a0c11892a18 diff --git a/cdparanoia/Pkgfile b/cdparanoia/Pkgfile index 1115353..b3f8554 100644 --- a/cdparanoia/Pkgfile +++ b/cdparanoia/Pkgfile @@ -13,5 +13,5 @@ build () { patch -p0 -i $SRC/$name-$version-gcc43.patch ./configure --prefix=/usr make -j1 - make prefix=$PKG/usr install + make prefix=$PKG/usr MANDIR=$PKG/usr/share/man install }

1 0

ports/opt (3.3): ccrypt: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 096015f69dfa52c797f3ea90bc1ab2e4ea57c6dd Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:09:13 2016 +0100 ccrypt: move man-pages to /usr/share/man diff --git a/ccrypt/.footprint b/ccrypt/.footprint index f919c38..7e806c1 100644 --- a/ccrypt/.footprint +++ b/ccrypt/.footprint @@ -5,10 +5,11 @@ lrwxrwxrwx root/root usr/bin/ccdecrypt -> ccrypt lrwxrwxrwx root/root usr/bin/ccencrypt -> ccrypt -rwxr-xr-x root/root usr/bin/ccguess -rwxr-xr-x root/root usr/bin/ccrypt -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ -lrwxrwxrwx root/root usr/man/man1/ccat.1.gz -> ccrypt.1.gz -lrwxrwxrwx root/root usr/man/man1/ccdecrypt.1.gz -> ccrypt.1.gz -lrwxrwxrwx root/root usr/man/man1/ccencrypt.1.gz -> ccrypt.1.gz --rw-r--r-- root/root usr/man/man1/ccguess.1.gz --rw-r--r-- root/root usr/man/man1/ccrypt.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +lrwxrwxrwx root/root usr/share/man/man1/ccat.1.gz -> ccrypt.1.gz +lrwxrwxrwx root/root usr/share/man/man1/ccdecrypt.1.gz -> ccrypt.1.gz +lrwxrwxrwx root/root usr/share/man/man1/ccencrypt.1.gz -> ccrypt.1.gz +-rw-r--r-- root/root usr/share/man/man1/ccguess.1.gz +-rw-r--r-- root/root usr/share/man/man1/ccrypt.1.gz diff --git a/ccrypt/.signature b/ccrypt/.signature index bad27e0..ce5c215 100644 --- a/ccrypt/.signature +++ b/ccrypt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YMLSqXnJ+m0Kbesz2hRbH+0ZFC/f2YUgsLgt8MF5P3NSeo79BFvv/jfq2rcvIzibTQ557PhBVuh0lEct3vCKQw= -SHA256 (Pkgfile) = 716cc350fdeb0607a83a5689a36c0d0bcc1adad36c54d38186c69bfc36b4772d -SHA256 (.footprint) = b71cd24d15b2b00f0205b9999cf381cbe179178e3b0ed4fefb05450a96d5fa5b +RWSE3ohX2g5d/aTvixjU+wW34cYK1eibi5MBTgDJX8QuGP44VA8180br4BJ+BYZafvZ4E1CTTECLTvZ1uWvoCkS5epaDfu/Kzgc= +SHA256 (Pkgfile) = dc7c14c2d3403b4fd8bd73358f4e699444b878440fce43036a988be92892dae1 +SHA256 (.footprint) = cdc2444e6be2a2d27664279b7100258a8bb9ab1544bf455a25654d81f8a06727 SHA256 (ccrypt-1.10.tar.gz) = 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 diff --git a/ccrypt/Pkgfile b/ccrypt/Pkgfile index c057960..0df5c7a 100644 --- a/ccrypt/Pkgfile +++ b/ccrypt/Pkgfile @@ -4,12 +4,12 @@ name=ccrypt version=1.10 -release=1 +release=2 source=(http://ccrypt.sourceforge.net/download/$name-$version.tar.gz) build () { cd $name-$version - ./configure --prefix=/usr --mandir=/usr/man --disable-nls + ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install }

1 0

ports/opt (3.3): aterm: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 02d5dc28de401e7d2ac338d1445b1f73ca7f363a Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:07:59 2016 +0100 aterm: move man-pages to /usr/share/man diff --git a/aterm/.footprint b/aterm/.footprint index 6aff0fe..8c1e9d6 100644 --- a/aterm/.footprint +++ b/aterm/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/aterm -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/aterm.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/aterm.1.gz diff --git a/aterm/.signature b/aterm/.signature index eb29820..53b71b6 100644 --- a/aterm/.signature +++ b/aterm/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RBSqmItpGJDNuDHCmOZuuJC9qeY2xJ2eqDgEU6zh/7HO0XTQTZNMlGFV5Ofn1Le8siksKQBVGs9sQQZs/EKSQg= -SHA256 (Pkgfile) = 18109225612f195d3ad5bd6a46a87aad05a217c33b5bb27f5c85bc4a114d03b7 -SHA256 (.footprint) = effc71e1a97753360dc82ef4139c866534bc50f8a9e262f8705419d8b831c631 +RWSE3ohX2g5d/Y+gZZlOBPQngw7R0yP0S8PakMhQf9P1mO3f/6dsuj+zIXBqUkPV/YjiIeDJVyf1syMtiO7CFMcYWfPLYaSOow4= +SHA256 (Pkgfile) = 09976472d32d841327a009e46de2670bbf06456d9623e05395acdda50bdf4c9c +SHA256 (.footprint) = 5219752af9d60b412e814b7c6e9a052606b049aef9ce4fd7e0a10363774b177a SHA256 (aterm-1.0.1.tar.gz) = 0b385c7d00ffdd488f7950e0de109576f55a04b4c056dce426ae2f8ed564f214 SHA256 (aterm-fake_root.patch) = 3db26944014418ad5a6c8826ab6148070f33062d85bcf3a8ad1c7e2cdc0c7af6 SHA256 (aterm-fkeys.patch) = 6f494ec23456d04af1170e9a5133bc2447cb5986c49da686b8d7c40c59f98aed diff --git a/aterm/Pkgfile b/aterm/Pkgfile index b2b4aae..3117e8f 100644 --- a/aterm/Pkgfile +++ b/aterm/Pkgfile @@ -5,7 +5,7 @@ name=aterm version=1.0.1 -release=2 +release=3 source=(http://download.sourceforge.net/$name/$name-$version.tar.gz $name-fake_root.patch $name-fkeys.patch @@ -21,7 +21,7 @@ build () { cp autoconf/configure.in . autoconf autoheader - ./configure --prefix=/usr --enable-fake-root --mandir=/usr/man + ./configure --prefix=/usr --enable-fake-root make make DESTDIR=$PKG install }

1 0

ports/opt (3.3): a2ps: move man-pages to /usr/share/man
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 69a73524176e6b4629460579d686a14693006df3 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 14:05:30 2016 +0100 a2ps: move man-pages to /usr/share/man diff --git a/a2ps/.footprint b/a2ps/.footprint index 14062a7..4bda104 100644 --- a/a2ps/.footprint +++ b/a2ps/.footprint @@ -18,16 +18,6 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/liba2ps.a -rwxr-xr-x root/root usr/lib/liba2ps.la -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/a2ps.1.gz --rw-r--r-- root/root usr/man/man1/card.1.gz --rw-r--r-- root/root usr/man/man1/fixps.1.gz --rw-r--r-- root/root usr/man/man1/ogonkify.1.gz --rw-r--r-- root/root usr/man/man1/pdiff.1.gz --rw-r--r-- root/root usr/man/man1/psmandup.1.gz --rw-r--r-- root/root usr/man/man1/psset.1.gz --rw-r--r-- root/root usr/man/man1/texi2dvi4a2ps.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/a2ps/ drwxr-xr-x root/root usr/share/a2ps/afm/ @@ -223,6 +213,16 @@ drwxr-xr-x root/root usr/share/a2ps/sheets/ -rw-r--r-- root/root usr/share/a2ps/sheets/xs.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/yacc.ssh -rw-r--r-- root/root usr/share/a2ps/sheets/zsh.ssh +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/a2ps.1.gz +-rw-r--r-- root/root usr/share/man/man1/card.1.gz +-rw-r--r-- root/root usr/share/man/man1/fixps.1.gz +-rw-r--r-- root/root usr/share/man/man1/ogonkify.1.gz +-rw-r--r-- root/root usr/share/man/man1/pdiff.1.gz +-rw-r--r-- root/root usr/share/man/man1/psmandup.1.gz +-rw-r--r-- root/root usr/share/man/man1/psset.1.gz +-rw-r--r-- root/root usr/share/man/man1/texi2dvi4a2ps.1.gz drwxr-xr-x root/root usr/share/ogonkify/ -rw-r--r-- root/root usr/share/ogonkify/adobe.enc drwxr-xr-x root/root usr/share/ogonkify/afm/ diff --git a/a2ps/.signature b/a2ps/.signature index f8fd4ac..66992b9 100644 --- a/a2ps/.signature +++ b/a2ps/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bGnaXaJCzSNegCJZhvteTEfg08TN6JIHHYURhCJef4sKZBm3ZxZlu8/N/xQByrvTmLlTFs8pt9eRdQQ6Fjtgwo= -SHA256 (Pkgfile) = 63e87976d7a98db74b7358c258d8f3364ea943df5b349ee12dbd4fdc475fb143 -SHA256 (.footprint) = 47fbc3d39c1a80690ef68df3443b08d1f89f6021504d5024e46cf5fab0b76c83 +RWSE3ohX2g5d/f7zUDYX38Z1laVbweDNd58XskrmCxfo1fZ07LvQFoIwgWpBhWIj/7oXE/mskY5MsfOVu7QbEImQM6gdP0hI5w4= +SHA256 (Pkgfile) = a2ebf25428928524d7179cdfae96880f60a55742fc274299be0fbd4c5bd0dffc +SHA256 (.footprint) = 39d0588420f5678d5bc1629a1336e6955fb6953c6a39ea7c14e4d2c55a7297d3 SHA256 (a2ps-4.14.tar.gz) = f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4 diff --git a/a2ps/Pkgfile b/a2ps/Pkgfile index 4f7400a..5797219 100644 --- a/a2ps/Pkgfile +++ b/a2ps/Pkgfile @@ -5,14 +5,13 @@ name=a2ps version=4.14 -release=1 +release=2 source=(http://ftp.gnu.org/gnu/a2ps/$name-$version.tar.gz) build() { cd $name-$version ./configure --prefix=/usr \ - --mandir=/usr/man \ --disable-nls make make DESTDIR=$PKG install

1 0

ports/contrib (3.2): libreoffice: 5.2.2 -> 5.2.3
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit aa9f24fc44f9d6ae2fb5ccf22f9cd41b97f6a865 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue Nov 22 13:17:12 2016 +0100 libreoffice: 5.2.2 -> 5.2.3 diff --git a/libreoffice/.footprint b/libreoffice/.footprint index 9d394fa..33d674b 100644 --- a/libreoffice/.footprint +++ b/libreoffice/.footprint @@ -153,6 +153,7 @@ drwxr-xr-x root/root usr/lib/libreoffice/program/classes/ -rwxr-xr-x root/root usr/lib/libreoffice/program/libforuilo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libfps_officelo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libfreebl3.so +-rwxr-xr-x root/root usr/lib/libreoffice/program/libfreeblpriv3.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libfrmlo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libfwllo.so -rwxr-xr-x root/root usr/lib/libreoffice/program/libfwmlo.so @@ -7073,8 +7074,20 @@ drwxr-xr-x root/root usr/lib/libreoffice/share/fonts/truetype/ -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/PT_Serif-Web-BoldItalic.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/PT_Serif-Web-Italic.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/PT_Serif-Web-Regular.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Black.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-BlackIt.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Bold.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-BoldIt.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-ExtraLight.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-ExtraLightIt.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-It.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Light.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-LightIt.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Medium.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-MediumIt.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Regular.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-Semibold.ttf +-rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceCodePro-SemiboldIt.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceSansPro-Black.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceSansPro-BlackIt.ttf -rw-r--r-- root/root usr/lib/libreoffice/share/fonts/truetype/SourceSansPro-Bold.ttf diff --git a/libreoffice/.md5sum b/libreoffice/.md5sum index 8046a8b..567ca1a 100644 --- a/libreoffice/.md5sum +++ b/libreoffice/.md5sum @@ -1 +1 @@ -67fac09efab4fcdcb3a8d530929d38a0 LibreOffice_5.2.2_Linux_x86-64_rpm.tar.gz +06edfe30aebb00ff80738855ae22b01c LibreOffice_5.2.3_Linux_x86-64_rpm.tar.gz diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 9e014b0..16e18f7 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,7 +5,7 @@ # Depends on: mesa3d cups xorg-libxaw xorg-libxcursor xorg-libxft xorg-libxinerama xorg-libxi xorg-libxrandr dbus-glib krb5 glu name=libreoffice -version=5.2.2 +version=5.2.3 release=1 source=(http://download.documentfoundation.org/$name/stable/$version/rpm/x8…

1 0

ports/opt (3.3): qt5: signature update
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 709c0998f93e95ca976d0b26642aea2081e66294 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 22 12:50:00 2016 +0100 qt5: signature update diff --git a/qt5/.signature b/qt5/.signature index 84538c9..7008856 100644 --- a/qt5/.signature +++ b/qt5/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dxjxHYYEVusuP/i2f6R+sx2LNfRoNVM/+jGtuU5hxhdT7mF0MbCL4+Ta6iEjr/h9X2201SJhsVQfqFIKscrAws= -SHA256 (Pkgfile) = dfc3cb0d2f5fed1abc6850721b4adb7474f6f5a988fc3fd4c91d0c107b0d6f6e +RWSE3ohX2g5d/Zq8DNRTYnah45T0jk+/lwiid6AcOhWqjPcwSA3jaco4OjUGn6OvRMtFsOlT//95OPSflYK/a9zf8yYv4+j0tQU= +SHA256 (Pkgfile) = 54cac036ae930d90bfc30b2c1a6c08e8f6448dedfa825e2b5e78f73c35ce5a74 SHA256 (.footprint) = 94e157a05d678c8beb1278aedae36cdb2733853f41a6f11f54b50d979c53b5cc SHA256 (qt-everywhere-opensource-src-5.7.0.tar.xz) = a6a2632de7e44bbb790bc3b563f143702c610464a7f537d02036749041fd1800 SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e @@ -8,3 +8,4 @@ SHA256 (qtbug-53071.patch) = 33952e83f86afe0eb4bc5b25461c70ea3b8365b43633cd20109 SHA256 (qtbug-53071b.patch) = d4916b3ba871e7aa2ad45822494b0f3538689befce24d5391089d27734987c8f SHA256 (qtbug-53237.patch) = d7e1b09552713ea82b5b2a8c668f40d8bdb0879fe1d0e91c0dc435efabcbad7c SHA256 (qtbug-49452.patch) = e618b8d10082034d091b60981f13ff2a02b463861538b239c7243bec938ed135 +SHA256 (qtbase-memory-leak.patch) = c7952a6d611aa3599163ab63d481c5b4dbdae2fb70b0a638f241e03237820a96

1 0

ports/opt (3.3): gphoto2: update to 2.5.11
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit 8d5cca8b76e67ae76b79f348a0859abee4acaff6 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Nov 21 12:21:30 2016 +0100 gphoto2: update to 2.5.11 diff --git a/gphoto2/.md5sum b/gphoto2/.md5sum index 6cccb53..0fc46f9 100644 --- a/gphoto2/.md5sum +++ b/gphoto2/.md5sum @@ -1 +1 @@ -7b3d0e721f6c1a151c6b9e130223d934 gphoto2-2.5.10.tar.bz2 +a62a51474a681aca51b087905deb5e35 gphoto2-2.5.11.tar.bz2 diff --git a/gphoto2/Pkgfile b/gphoto2/Pkgfile index ba5fddf..0d380f4 100644 --- a/gphoto2/Pkgfile +++ b/gphoto2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline popt libgphoto2 name=gphoto2 -version=2.5.10 +version=2.5.11 release=1 source=(http://downloads.sourceforge.net/project/gphoto/gphoto/$version/$na…

1 0

ports/opt (3.3): libgphoto2: update to 2.5.11
by crux＠crux.nu 22 Nov '16

22 Nov '16

commit b802363248dbe55565e91a3fef4e759c82134e90 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Nov 21 12:21:17 2016 +0100 libgphoto2: update to 2.5.11 diff --git a/libgphoto2/.footprint b/libgphoto2/.footprint index fcaa13f..8c2d800 100644 --- a/libgphoto2/.footprint +++ b/libgphoto2/.footprint @@ -32,71 +32,71 @@ lrwxrwxrwx root/root usr/lib/libgphoto2.so -> libgphoto2.so.6.0.0 lrwxrwxrwx root/root usr/lib/libgphoto2.so.6 -> libgphoto2.so.6.0.0 -rwxr-xr-x root/root usr/lib/libgphoto2.so.6.0.0 drwxr-xr-x root/root usr/lib/libgphoto2/ -drwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/adc65.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/agfa_cl20.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/aox.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ax203.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/barbie.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/canon.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/casio_qv.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/clicksmart310.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digigr8.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digita.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimagev.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimera3500.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/directory.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/enigma13.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/fuji.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/gsmart300.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/hp215.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/iclick.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jamcam.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jd11.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005a.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005c.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc120.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc210.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc240.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc3200.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_ez200.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica_qm150.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/largan.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/lg_gsm.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mars.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mustek.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_coolshot.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1000.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1580.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_l859.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam300.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam600.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pentax.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc320.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc640.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc700.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ptp2.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh_g3.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/samsung.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sierra.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_blink2.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_web2.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/smal.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sonix.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf1.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf55.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/soundvision.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/spca50x.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sq905.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/st2205.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0674.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0680.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sx330z.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/topfield.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/toshiba_pdrm11.so --rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/tp6801.so +drwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/adc65.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/agfa_cl20.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/aox.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ax203.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/barbie.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/canon.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/casio_qv.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/clicksmart310.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digigr8.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digita.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimagev.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimera3500.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/directory.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/enigma13.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/fuji.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/gsmart300.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/hp215.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/iclick.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jamcam.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jd11.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005a.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005c.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc120.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc210.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc240.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc3200.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_ez200.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica_qm150.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/largan.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/lg_gsm.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mars.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mustek.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_coolshot.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1000.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1580.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_l859.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam300.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam600.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pentax.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc320.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc640.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc700.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ptp2.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh_g3.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/samsung.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sierra.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_blink2.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_web2.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/smal.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sonix.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf1.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf55.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/soundvision.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/spca50x.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sq905.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/st2205.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0674.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0680.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sx330z.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/topfield.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/toshiba_pdrm11.so +-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/tp6801.so -rwxr-xr-x root/root usr/lib/libgphoto2/print-camera-list -rwxr-xr-x root/root usr/lib/libgphoto2_port.la lrwxrwxrwx root/root usr/lib/libgphoto2_port.so -> libgphoto2_port.so.12.0.0 @@ -116,14 +116,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2_port.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/libgphoto2/ -drwxr-xr-x root/root usr/share/libgphoto2/2.5.10/ -drwxr-xr-x root/root usr/share/libgphoto2/2.5.10/konica/ --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/english --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/french --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/german --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/japanese --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/korean --rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/spanish +drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/ +drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/konica/ +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/english +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/french +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/german +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/japanese +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/korean +-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/spanish drwxr-xr-x root/root usr/share/libgphoto2_port/ drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/ drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/vcamera/ diff --git a/libgphoto2/.md5sum b/libgphoto2/.md5sum index 4cda53d..e5cb949 100644 --- a/libgphoto2/.md5sum +++ b/libgphoto2/.md5sum @@ -1,2 +1 @@ -04132b5a9a650929cef68b7eb360a057 jpeg-1.5.0.patch -f1e53e684a3ea51cc7958d7e4eee7f37 libgphoto2-2.5.10.tar.bz2 +2426511143e6f2fae4f3744e91acfbc3 libgphoto2-2.5.11.tar.bz2 diff --git a/libgphoto2/Pkgfile b/libgphoto2/Pkgfile index bb449f3..1067797 100644 --- a/libgphoto2/Pkgfile +++ b/libgphoto2/Pkgfile @@ -5,14 +5,12 @@ # Depends on: libtool libusb-compat libjpeg-turbo libexif name=libgphoto2 -version=2.5.10 -release=2 -source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2 - jpeg-1.5.0.patch) +version=2.5.11 +release=1 +source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2) build () { cd $name-$version - patch -p1 -i $SRC/jpeg-1.5.0.patch udevscriptdir=/lib/udev \ ./configure --prefix=/usr --disable-nls diff --git a/libgphoto2/jpeg-1.5.0.patch b/libgphoto2/jpeg-1.5.0.patch deleted file mode 100644 index 34baead..0000000 --- a/libgphoto2/jpeg-1.5.0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly(a)intel.com> -Date: Wed, 15 Jun 2016 10:33:24 +0200 -Subject: [PATCH] jpeg_memsrcdest: extend feature check - -libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides -these methods if "JPEG_LIB_VERSION >= 80 || -defined(MEM_SRCDST_SUPPORTED)". - -The support for the jpeg_mem functions was added even when not -emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED -define, so checking for the version alone is not enough anymore. - -See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222b… - -This fixes errors about conflicting declarations (signed vs. unsigned -char). - -Signed-off-by: Patrick Ohly <patrick.ohly(a)intel.com> ---- - camlibs/ax203/jpeg_memsrcdest.c | 4 ++-- - camlibs/ax203/jpeg_memsrcdest.h | 4 ++++ - camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++-- - camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++ - 4 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c -index 0ed83b1..5614573 100644 ---- a/camlibs/ax203/jpeg_memsrcdest.c -+++ b/camlibs/ax203/jpeg_memsrcdest.c -@@ -25,8 +25,8 @@ - #include "jpeg_memsrcdest.h" - - /* libjpeg8 and later come with their own (API compatible) memory source -- and dest */ --#if JPEG_LIB_VERSION < 80 -+ and dest, and older versions may have it backported */ -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - -diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h -index e971182..b13bf3f 100644 ---- a/camlibs/ax203/jpeg_memsrcdest.h -+++ b/camlibs/ax203/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include <jpeglib.h> - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif -diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c -index 321f926..b65310e 100644 ---- a/camlibs/jl2005c/jpeg_memsrcdest.c -+++ b/camlibs/jl2005c/jpeg_memsrcdest.c -@@ -25,8 +25,8 @@ - #include "jpeg_memsrcdest.h" - - /* libjpeg8 and later come with their own (API compatible) memory source -- and dest */ --#if JPEG_LIB_VERSION < 80 -+ and dest, and older versions may have it backported */ -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) - - /* Expanded data source object for memory input */ - -diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h -index e971182..b13bf3f 100644 ---- a/camlibs/jl2005c/jpeg_memsrcdest.h -+++ b/camlibs/jl2005c/jpeg_memsrcdest.h -@@ -1,5 +1,7 @@ - #include <jpeglib.h> - -+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) -+ - void - jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - unsigned long bufsize); -@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, - void - jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, - unsigned long * outsize); -+ -+#endif

1 0