November 2015 - crux-commits

ports/opt (3.1): Merge branch '3.1' into 3.2
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 3bd503ad0652b33b4c66794b699ae2957fa98fa8 Merge: dfbd96d e8bdc9f Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 10 15:02:17 2015 +0200 Merge branch '3.1' into 3.2

1 0

ports/opt (3.1): Merge branch '3.1' into 3.2
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 5c68e0a118d6c78b826ee48739b2de127cf49865 Merge: 3bd503a 55122a5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Jul 14 22:23:51 2015 +0200 Merge branch '3.1' into 3.2

1 0

ports/opt (3.1): libmng: move man-pages to /usr/share/man
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 309952d6bc6c1fc8f71ded2c1e0579fb4407339c Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:55:39 2015 +0200 libmng: move man-pages to /usr/share/man diff --git a/libmng/.footprint b/libmng/.footprint index 9aea1f9..dcbac63 100644 --- a/libmng/.footprint +++ b/libmng/.footprint @@ -11,9 +11,10 @@ lrwxrwxrwx root/root usr/lib/libmng.so.2 -> libmng.so.2.0.2 -rwxr-xr-x root/root usr/lib/libmng.so.2.0.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libmng.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --rw-r--r-- root/root usr/man/man3/libmng.3.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/jng.5.gz --rw-r--r-- root/root usr/man/man5/mng.5.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/libmng.3.gz +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/jng.5.gz +-rw-r--r-- root/root usr/share/man/man5/mng.5.gz diff --git a/libmng/Pkgfile b/libmng/Pkgfile index f41ea94..d58dbe7 100644 --- a/libmng/Pkgfile +++ b/libmng/Pkgfile @@ -5,12 +5,12 @@ name=libmng version=2.0.3 -release=1 +release=2 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.xz) build() { cd $name-$version - ./configure --prefix=/usr --mandir=/usr/man + ./configure --prefix=/usr make make DESTDIR=$PKG install }

1 0

ports/opt (3.1): libffi: move man-pages to /usr/share/man
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit ea0eddcd7f5e98ff885f2206d600260b4d3b0358 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:54:12 2015 +0200 libffi: move man-pages to /usr/share/man diff --git a/libffi/.footprint b/libffi/.footprint index 867a345..663a442 100644 --- a/libffi/.footprint +++ b/libffi/.footprint @@ -11,3 +11,10 @@ lrwxrwxrwx root/root usr/lib/libffi.so.6 -> libffi.so.6.0.4 -rwxr-xr-x root/root usr/lib/libffi.so.6.0.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libffi.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/ffi.3.gz +-rw-r--r-- root/root usr/share/man/man3/ffi_call.3.gz +-rw-r--r-- root/root usr/share/man/man3/ffi_prep_cif.3.gz +-rw-r--r-- root/root usr/share/man/man3/ffi_prep_cif_var.3.gz diff --git a/libffi/Pkgfile b/libffi/Pkgfile index 2d1baf9..9fa8a39 100644 --- a/libffi/Pkgfile +++ b/libffi/Pkgfile @@ -12,5 +12,5 @@ build() { ./configure --prefix=/usr make make DESTDIR=$PKG install - rm -r $PKG/usr/share + rm -r $PKG/usr/share/info }

1 0

ports/opt (3.1): gtk3: move man-pages to /usr/share/man
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 353ce617c6025227cc496f26effc7d7f87b0c7c5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:53:54 2015 +0200 gtk3: move man-pages to /usr/share/man diff --git a/gtk3/.footprint b/gtk3/.footprint index 3fee028..ab69049 100644 --- a/gtk3/.footprint +++ b/gtk3/.footprint @@ -446,17 +446,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gtk+-3.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gtk+-unix-print-3.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gtk+-x11-3.0.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/broadwayd.1.gz --rw-r--r-- root/root usr/man/man1/gtk-encode-symbolic-svg.1.gz --rw-r--r-- root/root usr/man/man1/gtk-launch.1.gz --rw-r--r-- root/root usr/man/man1/gtk-query-immodules-3.0.1.gz --rw-r--r-- root/root usr/man/man1/gtk-update-icon-cache.1.gz --rw-r--r-- root/root usr/man/man1/gtk3-demo-application.1.gz --rw-r--r-- root/root usr/man/man1/gtk3-demo.1.gz --rw-r--r-- root/root usr/man/man1/gtk3-icon-browser.1.gz --rw-r--r-- root/root usr/man/man1/gtk3-widget-factory.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gtk-3.0.m4 @@ -513,6 +502,17 @@ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/gtk3-demo.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/gtk3-widget-factory-symbolic.symbolic.png -rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/gtk3-widget-factory.png +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/broadwayd.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk-encode-symbolic-svg.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk-launch.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk-query-immodules-3.0.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk-update-icon-cache.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk3-demo-application.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk3-demo.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk3-icon-browser.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtk3-widget-factory.1.gz drwxr-xr-x root/root usr/share/themes/ drwxr-xr-x root/root usr/share/themes/Default/ drwxr-xr-x root/root usr/share/themes/Default/gtk-3.0/ diff --git a/gtk3/Pkgfile b/gtk3/Pkgfile index e9ca46d..370987f 100644 --- a/gtk3/Pkgfile +++ b/gtk3/Pkgfile @@ -5,13 +5,13 @@ name=gtk3 version=3.16.6 -release=1 +release=2 source=(http://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version… build () { cd gtk+-$version - ./configure --prefix=/usr --mandir=/usr/man + ./configure --prefix=/usr make make DESTDIR=$PKG install rm -r $PKG/usr/share/{gtk-doc,locale,gtk-3.0} diff --git a/libffi/.footprint b/libffi/.footprint index 21d5e3f..867a345 100644 --- a/libffi/.footprint +++ b/libffi/.footprint @@ -11,9 +11,3 @@ lrwxrwxrwx root/root usr/lib/libffi.so.6 -> libffi.so.6.0.4 -rwxr-xr-x root/root usr/lib/libffi.so.6.0.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libffi.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --rw-r--r-- root/root usr/man/man3/ffi.3.gz --rw-r--r-- root/root usr/man/man3/ffi_call.3.gz --rw-r--r-- root/root usr/man/man3/ffi_prep_cif.3.gz --rw-r--r-- root/root usr/man/man3/ffi_prep_cif_var.3.gz diff --git a/libffi/Pkgfile b/libffi/Pkgfile index 18d5831..2d1baf9 100644 --- a/libffi/Pkgfile +++ b/libffi/Pkgfile @@ -4,12 +4,12 @@ name=libffi version=3.2.1 -release=1 +release=2 source=(ftp://sourceware.org/pub/libffi/$name-$version.tar.gz) build() { cd $name-$version - ./configure --prefix=/usr --mandir=/usr/man + ./configure --prefix=/usr make make DESTDIR=$PKG install rm -r $PKG/usr/share

1 0

ports/opt (3.1): gtk: cleanup
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 4f0098a71ccbd240f13cc83cdb405c5beae93468 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:51:37 2015 +0200 gtk: cleanup diff --git a/gtk/Pkgfile b/gtk/Pkgfile index 3258de6..b2310b9 100644 --- a/gtk/Pkgfile +++ b/gtk/Pkgfile @@ -12,7 +12,7 @@ source=(http://download.gnome.org/sources/gtk+/2.24/${name}+-$version.tar.xz \ build () { cd gtk+-$version - ./configure --prefix=/usr --mandir=/usr/man + ./configure --prefix=/usr make make DESTDIR=$PKG install mkdir -p $PKG/usr/etc/gtk-2.0

1 0

ports/opt (3.1): glib: move man-pages to /usr/share/man
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit e854fc35f017728001f4b4920c937e56a2516eee Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:48:33 2015 +0200 glib: move man-pages to /usr/share/man diff --git a/glib/.footprint b/glib/.footprint index b21eb86..03b294d 100644 --- a/glib/.footprint +++ b/glib/.footprint @@ -314,22 +314,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gmodule-no-export-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gobject-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gthread-2.0.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/gapplication.1.gz --rw-r--r-- root/root usr/man/man1/gdbus-codegen.1.gz --rw-r--r-- root/root usr/man/man1/gdbus.1.gz --rw-r--r-- root/root usr/man/man1/gio-querymodules.1.gz --rw-r--r-- root/root usr/man/man1/glib-compile-resources.1.gz --rw-r--r-- root/root usr/man/man1/glib-compile-schemas.1.gz --rw-r--r-- root/root usr/man/man1/glib-genmarshal.1.gz --rw-r--r-- root/root usr/man/man1/glib-gettextize.1.gz --rw-r--r-- root/root usr/man/man1/glib-mkenums.1.gz --rw-r--r-- root/root usr/man/man1/gobject-query.1.gz --rw-r--r-- root/root usr/man/man1/gresource.1.gz --rw-r--r-- root/root usr/man/man1/gsettings.1.gz --rw-r--r-- root/root usr/man/man1/gtester-report.1.gz --rw-r--r-- root/root usr/man/man1/gtester.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/glib-2.0.m4 @@ -373,3 +357,19 @@ drwxr-xr-x root/root usr/share/glib-2.0/gettext/po/ -rw-r--r-- root/root usr/share/glib-2.0/gettext/po/Makefile.in.in drwxr-xr-x root/root usr/share/glib-2.0/schemas/ -rw-r--r-- root/root usr/share/glib-2.0/schemas/gschema.dtd +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/gapplication.1.gz +-rw-r--r-- root/root usr/share/man/man1/gdbus-codegen.1.gz +-rw-r--r-- root/root usr/share/man/man1/gdbus.1.gz +-rw-r--r-- root/root usr/share/man/man1/gio-querymodules.1.gz +-rw-r--r-- root/root usr/share/man/man1/glib-compile-resources.1.gz +-rw-r--r-- root/root usr/share/man/man1/glib-compile-schemas.1.gz +-rw-r--r-- root/root usr/share/man/man1/glib-genmarshal.1.gz +-rw-r--r-- root/root usr/share/man/man1/glib-gettextize.1.gz +-rw-r--r-- root/root usr/share/man/man1/glib-mkenums.1.gz +-rw-r--r-- root/root usr/share/man/man1/gobject-query.1.gz +-rw-r--r-- root/root usr/share/man/man1/gresource.1.gz +-rw-r--r-- root/root usr/share/man/man1/gsettings.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtester-report.1.gz +-rw-r--r-- root/root usr/share/man/man1/gtester.1.gz diff --git a/glib/Pkgfile b/glib/Pkgfile index 5205a88..b6e100e 100644 --- a/glib/Pkgfile +++ b/glib/Pkgfile @@ -5,7 +5,7 @@ name=glib version=2.44.0 -release=1 +release=2 source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$versi… build () { @@ -17,8 +17,8 @@ build () { make make -j1 DESTDIR=$PKG install - install -d $PKG/usr/man/man1 - find docs -name '*.1' -exec install -m 0644 {} $PKG/usr/man/man1 \; + install -d $PKG/usr/share/man/man1 + find docs -name '*.1' -exec install -m 0644 {} $PKG/usr/share/man/man1 \; rm -rf $PKG/usr/share/{gtk-doc,locale} rm -r $PKG/usr/share/bash-completion

1 0

ports/opt (3.1): gdk-pixbuf: move man-pages to /usr/share/man
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 1c8cb5468f48585cbc887042ec8b4b89f07a9648 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:46:35 2015 +0200 gdk-pixbuf: move man-pages to /usr/share/man diff --git a/gdk-pixbuf/.footprint b/gdk-pixbuf/.footprint index e6bdbb2..8862566 100644 --- a/gdk-pixbuf/.footprint +++ b/gdk-pixbuf/.footprint @@ -71,10 +71,10 @@ lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/gdk-pixbuf-csource.1.gz --rw-r--r-- root/root usr/man/man1/gdk-pixbuf-query-loaders.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/gir-1.0/ -rw-r--r-- root/root usr/share/gir-1.0/GdkPixbuf-2.0.gir +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/gdk-pixbuf-csource.1.gz +-rw-r--r-- root/root usr/share/man/man1/gdk-pixbuf-query-loaders.1.gz diff --git a/gdk-pixbuf/Pkgfile b/gdk-pixbuf/Pkgfile index 5ba2bd3..1234675 100644 --- a/gdk-pixbuf/Pkgfile +++ b/gdk-pixbuf/Pkgfile @@ -5,15 +5,17 @@ name=gdk-pixbuf version=2.30.8 -release=2 +release=3 source=(http://download.gnome.org/sources/$name/2.30/$name-$version.tar.xz \ gdk-pixbuf.loaders gdk-pixbuf-register.sh) build () { cd $name-$version - ./configure --prefix=/usr --mandir=/usr/man --disable-nls \ - --without-libjasper --with-x11 + ./configure --prefix=/usr \ + --disable-nls \ + --without-libjasper \ + --with-x11 make make DESTDIR=$PKG install

1 0

ports/opt (3.1): epdfview: dropped
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 212972f3f87b2861e2806f764d2152b0010a939d Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:44:38 2015 +0200 epdfview: dropped diff --git a/epdfview/.footprint b/epdfview/.footprint deleted file mode 100644 index 09f976a..0000000 --- a/epdfview/.footprint +++ /dev/null @@ -1,22 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/epdfview -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/epdfview.1.gz -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/epdfview.desktop -drwxr-xr-x root/root usr/share/epdfview/ -drwxr-xr-x root/root usr/share/epdfview/pixmaps/ --rw-r--r-- root/root usr/share/epdfview/pixmaps/icon_epdfview-24.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/icon_epdfview-32.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/icon_epdfview-48.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/stock_find_next_24.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/stock_find_previous_24.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/stock_rotate-270.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/stock_rotate-90.png --rw-r--r-- root/root usr/share/epdfview/pixmaps/stock_zoom-page-width.png -drwxr-xr-x root/root usr/share/epdfview/ui/ --rw-r--r-- root/root usr/share/epdfview/ui/epdfview-ui-print.xml --rw-r--r-- root/root usr/share/epdfview/ui/epdfview-ui.xml diff --git a/epdfview/.md5sum b/epdfview/.md5sum deleted file mode 100644 index 8522b91..0000000 --- a/epdfview/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -806a1a3ed437bb513a07299824c99dfa epdfview-0.1.8-fixes-1.patch -e50285b01612169b2594fea375f53ae4 epdfview-0.1.8.tar.bz2 diff --git a/epdfview/Pkgfile b/epdfview/Pkgfile deleted file mode 100644 index 6cf27ae..0000000 --- a/epdfview/Pkgfile +++ /dev/null @@ -1,18 +0,0 @@ -# Description: a GTK based pdf viewer -# URL: http://www.emma-soft.com/projects/epdfview -# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: gtk, poppler-glib - -name=epdfview -version=0.1.8 -release=4 -source=(http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/epdfview/$name-$version.tar.bz2 \ - epdfview-0.1.8-fixes-1.patch) - -build() { - cd $name-$version - patch -p1 -i $SRC/epdfview-0.1.8-fixes-1.patch - ./configure --prefix=/usr --disable-nls --mandir=/usr/man - make - make DESTDIR=$PKG install -} diff --git a/epdfview/epdfview-0.1.8-fixes-1.patch b/epdfview/epdfview-0.1.8-fixes-1.patch deleted file mode 100644 index 5e8ec28..0000000 --- a/epdfview/epdfview-0.1.8-fixes-1.patch +++ /dev/null @@ -1,146 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2012-08-22 -Initial Package Version: 0.1.8 -Upstream Status: Varies -Origin: Found at fedora. -Description: Three fixes found at fedora. For the first (only glib.h -can be included directly, with recent glib), we used to use a sed - but -the other two fixes need patches so I've put them all together. - - Second part is from upstream and fixes trashed colours -Upstream: http://trac.emma-soft.com/epdfview/changeset/367/trunk -Fixes bug: https://bugzilla.redhat.com/show_bug.cgi?id=745483 - - Third part is the most critical - from Jiri Popelka, found at -https://bugzilla.redhat.com/show_bug.cgi?id=841880 - looks as if fedora -haven't applied it yet. It solves building with cups-1.6. - -diff -Naur epdfview-0.1.8.orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h ---- epdfview-0.1.8.orig/src/gtk/StockIcons.h 2011-05-28 11:24:57.000000000 +0100 -+++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-08-22 20:06:08.728195806 +0100 -@@ -18,7 +18,7 @@ - #if !defined (__STOCK_ICONS_H__) - #define __STOCK_ICONS_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - -diff -Naur epdfview-0.1.8.orig/src/PDFDocument.cxx epdfview-0.1.8/src/PDFDocument.cxx ---- epdfview-0.1.8.orig/src/PDFDocument.cxx 2011-05-28 11:25:01.000000000 +0100 -+++ epdfview-0.1.8/src/PDFDocument.cxx 2012-08-22 20:07:03.627913886 +0100 -@@ -20,6 +20,7 @@ - #include <time.h> - #include <poppler.h> - #include <unistd.h> -+#include <algorithm> - #include "epdfview.h" - - using namespace ePDFView; -@@ -33,6 +34,24 @@ - static PageMode convertPageMode (gint pageMode); - static gchar *getAbsoluteFileName (const gchar *fileName); - -+namespace -+{ -+ void -+ convert_bgra_to_rgba (guint8 *data, int width, int height) -+ { -+ using std::swap; -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ swap(data[0], data[2]); -+ data += 4; -+ } -+ } -+ } -+} -+ - /// - /// @brief Constructs a new PDFDocument object. - /// -@@ -650,6 +669,7 @@ - poppler_page_render (page, context); - cairo_destroy(context); - cairo_surface_destroy (surface); -+ convert_bgra_to_rgba(renderedPage->getData (), width, height); - #else // !HAVE_POPPLER_0_17_0 - // Create the pixbuf from the data and render to it. - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (), -diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx ---- epdfview-0.1.8.orig/src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100 -+++ epdfview-0.1.8/src/PrintPter.cxx 2012-08-22 20:11:46.362436859 +0100 -@@ -22,6 +22,40 @@ - #include <locale.h> - #include "epdfview.h" - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+inline int ippGetInteger (ipp_attribute_t *attr, int element) -+{ -+ return (attr->values[element].integer); -+} -+ -+inline const char * ippGetString (ipp_attribute_t *attr, -+ int element, -+ const char **language /*UNUSED*/) -+{ -+ return (attr->values[element].string.text); -+} -+ -+inline int ippSetOperation (ipp_t *ipp, ipp_op_t op) -+{ -+ if (!ipp) -+ return (0); -+ ipp->request.op.operation_id = op; -+ return (1); -+} -+ -+inline int ippSetRequestId (ipp_t *ipp, int request_id) -+{ -+ if (!ipp) -+ return (0); -+ ipp->request.any.request_id = request_id; -+ return (1); -+} -+#endif -+ - using namespace ePDFView; - - // Structures -@@ -380,8 +414,8 @@ - - ipp_t *request = ippNew (); - -- request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; -- request->request.op.request_id = 1; -+ ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES); -+ ippSetRequestId(request, 1); - - ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, "utf-8"); -@@ -403,7 +437,7 @@ - ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO); - if ( NULL != state ) - { -- switch (state->values[0].integer) -+ switch (ippGetInteger (state, 0)) - { - case IPP_PRINTER_IDLE: - attributes->state = g_strdup (_("Idle")); -@@ -425,7 +459,7 @@ - ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO); - if ( NULL != location ) - { -- attributes->location = g_strdup (location->values[0].string.text); -+ attributes->location = g_strdup (ippGetString (location, 0, NULL)); - } - - ippDelete (answer);

1 0

ports/opt (3.1): dash: removed, moved to core
by crux＠crux.nu 18 Nov '15

18 Nov '15

commit 35a28c81b8d94211ddae55dcd3c63bc04238de9f Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 26 00:42:27 2015 +0200 dash: removed, moved to core diff --git a/dash/.footprint b/dash/.footprint deleted file mode 100644 index 6554042..0000000 --- a/dash/.footprint +++ /dev/null @@ -1,8 +0,0 @@ -drwxr-xr-x root/root bin/ -lrwxrwxrwx root/root bin/ash -> dash --rwxr-xr-x root/root bin/dash -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ -lrwxrwxrwx root/root usr/man/man1/ash.1.gz -> dash.1.gz --rw-r--r-- root/root usr/man/man1/dash.1.gz diff --git a/dash/.md5sum b/dash/.md5sum deleted file mode 100644 index 9d00459..0000000 --- a/dash/.md5sum +++ /dev/null @@ -1 +0,0 @@ -5c152209680dab3c319e8923f6c51378 dash-0.5.8.tar.gz diff --git a/dash/Pkgfile b/dash/Pkgfile deleted file mode 100644 index d001398..0000000 --- a/dash/Pkgfile +++ /dev/null @@ -1,24 +0,0 @@ -# Description: The Almquist shell, a POSIX-compliant /bin/sh implementation -# URL: http://gondor.apana.org.au/~herbert/dash/ -# Packager: Mark Rosenstand, mark at borkware dot net -# Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: - -name=dash -version=0.5.8 -release=1 -source=(http://gondor.apana.org.au/~herbert/dash/files/dash-$version.tar.gz) - -build() { - cd dash-$version - - ./configure \ - --prefix= \ - --mandir=/usr/man - - make - make DESTDIR=$PKG install - - ln -s dash $PKG/bin/ash - ln -s dash.1 $PKG/usr/man/man1/ash.1 -} diff --git a/dash/post-install b/dash/post-install deleted file mode 100755 index 2fecde7..0000000 --- a/dash/post-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -if ! grep dash /etc/shells > /dev/null 2>&1; then - echo "Adding dash to /etc/shells ..." - echo "/bin/dash" >> /etc/shells -fi

1 0