# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1546350506 -7200
# Node ID 6f5739796e82808788e43adbd1abde279f081b15
# Parent  27d8c72c641f9094f8c5c3230f7566a3c0d5992d
poppler: provide lib$PACKAGE for libs like some other packages do

diff -r 27d8c72c641f -r 6f5739796e82 atril/receipt
--- a/atril/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/atril/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -63,7 +63,7 @@
 		*-pdf)
 			copy pdfdocument.atril-backend libpdfdocument.so
 			CAT="office|PDF backend"
-			DEPENDS="atril cairo gdk-pixbuf glib gtk3 libxml2 pango poppler"
+			DEPENDS="atril cairo gdk-pixbuf glib gtk3 libxml2 pango libpoppler"
 			;;
 		*-psd)
 			copy psdocument.atril-backend libpsdocument.so
diff -r 27d8c72c641f -r 6f5739796e82 claws-mail/receipt
--- a/claws-mail/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/claws-mail/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -127,7 +127,7 @@
 		*-pdfviewer)
 			copy pdf_viewer.so
 			CAT="mail|PDF viewer"
-			DEPENDS="claws-mail lcms2 libjpeg-turbo poppler libtiff"
+			DEPENDS="claws-mail lcms2 libjpeg-turbo libpoppler libtiff"
 			;;
 		*-perl)
 			copy perl.so
diff -r 27d8c72c641f -r 6f5739796e82 cookutils/receipt
--- a/cookutils/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/cookutils/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="cookutils"
-VERSION="1113"
+VERSION="1125"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages builder new generation"
 MAINTAINER="devel@slitaz.org"
diff -r 27d8c72c641f -r 6f5739796e82 cups-filters/receipt
--- a/cups-filters/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/cups-filters/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -34,7 +34,7 @@
 		cups-filters)
 			copy @std
 			DEPENDS="cups dbus fontconfig freetype glib ijs lcms2 libcups \
-			libgnutls libjpeg-turbo libpng poppler qpdf libtiff zlib"
+			libgnutls libjpeg-turbo libpng libpoppler qpdf libtiff zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r 27d8c72c641f -r 6f5739796e82 efl/receipt
--- a/efl/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/efl/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -42,7 +42,7 @@
 			DEPENDS="bullet cairo dbus eudev fontconfig freetype fribidi \
 			giflib glib gst1-plugins-base gstreamer1 libharfbuzz libjpeg-turbo \
 			libpng libraw librsvg libspectre libunwind libwebp luajit mesa \
-			openssl poppler python libtiff util-linux-mount libx11 \
+			openssl libpoppler python libtiff util-linux-mount libx11 \
 			libxscrnsaver libxcomposite libxcursor \
 			libxdamage libxext libxfixes libxi \
 			libxinerama libxrandr libxrender libxtst zlib"
diff -r 27d8c72c641f -r 6f5739796e82 epdf/receipt
--- a/epdf/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/epdf/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		epdf)
 			copy @std
-			DEPENDS="poppler eina ecore evas"
+			DEPENDS="libpoppler eina ecore evas"
 			;;
 		*-dev)
 			copy @dev
diff -r 27d8c72c641f -r 6f5739796e82 epdfview-cups/receipt
--- a/epdfview-cups/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/epdfview-cups/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev poppler-dev poppler cups cups-dev"
+BUILD_DEPENDS="gtk2-dev poppler-dev cups-dev"
 
 compile_rules() {
 	sed -i 's/FORMAT_RGB24/FORMAT_ARGB32/g' src/PDFDocument.cxx
@@ -41,6 +41,6 @@
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
-	DEPENDS="gtk2 poppler glib libpng cups libxdamage gcc-lib-base libcomerr3"
+	DEPENDS="gtk2 libpoppler glib libpng cups libxdamage gcc-lib-base libcomerr3"
 	PROVIDE="epdfview:cups"
 }
diff -r 27d8c72c641f -r 6f5739796e82 epdfview/receipt
--- a/epdfview/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/epdfview/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/jristz/epdfview/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev poppler-dev poppler cairo-dev"
+BUILD_DEPENDS="gtk2-dev poppler-dev cairo-dev"
 
 compile_rules() {
 	sed -i 's/FORMAT_RGB24/FORMAT_ARGB32/g' src/PDFDocument.cxx
@@ -34,6 +34,6 @@
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
-	DEPENDS="gtk2 poppler glib libpng libxdamage gcc-lib-base"
+	DEPENDS="gtk2 libpoppler glib libpng libxdamage gcc-lib-base"
 	TAGS="pdf viewer"
 }
diff -r 27d8c72c641f -r 6f5739796e82 evince/receipt
--- a/evince/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/evince/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -16,7 +16,7 @@
 poppler-dev tiff-dev dbus-glib-dev xorg-dev lcms2-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="lcms poppler libtiff dbus-glib glib util-linux-uuid"
+DEPENDS_std="lcms libpoppler libtiff dbus-glib glib util-linux-uuid"
 TAGS_std="viewer pdf tiff ps postscript dvi"
 
 compile_rules() {
diff -r 27d8c72c641f -r 6f5739796e82 gambas2/receipt
--- a/gambas2/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/gambas2/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="poppler util-linux-uuid lcms2 libtiff jpeg libpng"
+	DEPENDS="libpoppler util-linux-uuid lcms2 libtiff jpeg libpng"
 	TAGS="interpreter basic"
 }
diff -r 27d8c72c641f -r 6f5739796e82 gimp/receipt
--- a/gimp/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/gimp/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -60,7 +60,7 @@
 			CAT="graphics|plug-ins suite for advanced users"
 			DEPENDS="aalib babl bzlib cairo gdk-pixbuf gegl gexiv2 gimp glib \
 			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng \
-			librsvg libwebp libwmf openexr openjpeg2 pango poppler libtiff \
+			librsvg libwebp libwmf openexr openjpeg2 pango libpoppler libtiff \
 			libx11 libxcursor libxpm zlib"
 			;;
 		gimp)
diff -r 27d8c72c641f -r 6f5739796e82 gnome-commander/receipt
--- a/gnome-commander/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/gnome-commander/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -35,5 +35,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="exiv2 gdk-pixbuf glib gnome-vfs gtk2 libgnome libgnomeui libgsf \
-	libunique pango poppler taglib"
+	libunique pango libpoppler taglib"
 }
diff -r 27d8c72c641f -r 6f5739796e82 gummi/receipt
--- a/gummi/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/gummi/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -23,5 +23,5 @@
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/gummi $fs/usr/share
-	DEPENDS="gtk2 gtksourceview gtkspell poppler"
+	DEPENDS="gtk2 gtksourceview gtkspell libpoppler"
 }
diff -r 27d8c72c641f -r 6f5739796e82 inkscape/receipt
--- a/inkscape/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/inkscape/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -59,7 +59,7 @@
 			gdk-pixbuf glib glibmm gnome-vfs gsl gtk2 gtkmm gtkspell \
 			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng \
 			librevenge libsigc++ libvisio libwpg libxml2 libxslt pango pangomm \
-			perl poppler popt potrace python libx11 zlib"
+			perl libpoppler popt potrace python libx11 zlib"
 			TAGS="image vector editor svg"
 			;;
 	esac
diff -r 27d8c72c641f -r 6f5739796e82 libosinfo/receipt
--- a/libosinfo/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/libosinfo/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="libosinfo"
-VERSION="1.1.0"
+VERSION="1.2.0"
 CATEGORY="libdevel"
 SHORT_DESC="GObject based library API for managing information about operating \
 systems, hypervisors and the (virtual) hardware devices they can support"
@@ -13,31 +13,21 @@
 WGET_URL="https://releases.pagure.org/libosinfo/$TARBALL"
 
 BUILD_DEPENDS="intltool libxslt-dev libsoup-dev gtk-doc check-dev \
-gobject-introspection-dev vala locale-en-base usbids pciids"
+gobject-introspection-dev vala usbids pciids"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="glib libxml2 libxslt"
+DEPENDS_dev="libosinfo glib-dev"
+
 compile_rules() {
-	mkdir -p /usr/lib/locale
-	localedef -i 'en_US' -c -f 'UTF-8' /usr/lib/locale/en_US.UTF-8
+	fix utf-8
 
 	./configure \
 		--with-usb-ids-path=/usr/share/hwdata/usb.ids \
 		--with-pci-ids-path=/usr/share/hwdata/pci.ids \
 		--enable-gtk-doc \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libosinfo)
-			copy @std
-			DEPENDS="glib libxml2 libxslt"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libosinfo glib-dev"
-			;;
-	esac
-}
diff -r 27d8c72c641f -r 6f5739796e82 mc/receipt
--- a/mc/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/mc/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -41,7 +41,7 @@
 			copy mc mcdiff mcedit mcview cons.saver
 			DEPENDS="glib libssh2 ncurses"
 			SUGGESTED="perl python openssl gpm xz cdrkit-isoinfo lynx w3m wv \
-			poppler-apps file"
+			poppler file"
 			TAGS="file-manager text-editor"
 			;;
 		mc-noarch)
diff -r 27d8c72c641f -r 6f5739796e82 pdf2djvu/receipt
--- a/pdf2djvu/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/pdf2djvu/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="djvulibre poppler"
+	DEPENDS="djvulibre libpoppler"
 	TAGS="pdf djvu"
 }
diff -r 27d8c72c641f -r 6f5739796e82 pluma/receipt
--- a/pluma/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/pluma/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -21,7 +21,9 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make install
+	make install || return 1
+
+	fix symlinks
 }
 
 genpkg_rules() {
diff -r 27d8c72c641f -r 6f5739796e82 poppler-data/receipt
--- a/poppler-data/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/poppler-data/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -8,14 +8,14 @@
 LICENSE="MIT"
 WEB_SITE="https://poppler.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html"
+HOST_ARCH="any"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
+TARBALL_SHA1="0ae7d4ec36f7a7585f0a8008f0a95d5771cef71b"
+
+COPY="@std @dev"
 
 compile_rules() {
 	make prefix=/usr install
 }
-
-genpkg_rules() {
-	copy @std @dev
-}
diff -r 27d8c72c641f -r 6f5739796e82 poppler-qt4/receipt
--- a/poppler-qt4/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/poppler-qt4/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -35,7 +35,7 @@
 	case $PACKAGE in
 		poppler-qt4)
 			copy /usr/lib/*qt4.so*
-			DEPENDS="poppler libQtCore libQtXml libQtGui"
+			DEPENDS="libpoppler libQtCore libQtXml libQtGui"
 			;;
 		*-apps)
 			copy /usr/bin/
@@ -45,7 +45,7 @@
 			CAT="office|utilities to manipulate PDF file"
 			DEPENDS="fontconfig poppler-qt4 cairo zlib libpng gcc-lib-base \
 			libQtCore libQtXml libQtGui"
-			PROVIDE="poppler-apps"
+			PROVIDE="poppler"
 			;;
 		*-dev)
 			copy \
diff -r 27d8c72c641f -r 6f5739796e82 poppler/receipt
--- a/poppler/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/poppler/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="poppler"
-VERSION="0.68.0"
+VERSION="0.72.0"
 CATEGORY="office"
 SHORT_DESC="PDF rendering library"
 MAINTAINER="devel@slitaz.org"
@@ -11,15 +11,19 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://poppler.freedesktop.org/$TARBALL"
+TARBALL_SHA1="34d3035eef26bf54cf847925a5b69bd0bf75c672"
 
 BUILD_DEPENDS="cmake freetype-dev fontconfig-dev libjpeg-turbo-dev zlib-dev \
 libpng-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
 gdk-pixbuf-dev openjpeg2-dev lcms2-dev curl-dev poppler-data"
-SPLIT="$PACKAGE-apps $PACKAGE-dev"
+SPLIT="lib$PACKAGE $PACKAGE $PACKAGE-dev"
+
+DEPENDS_libpoppler="cairo fontconfig freetype glib lcms2 libcurl libjpeg-turbo \
+libpng nspr nss openjpeg2 libtiff zlib"
+DEPENDS_std="lib$PACKAGE cairo freetype lcms2"
+DEPENDS_dev="$PACKAGE lib$PACKAGE cairo-dev glib-dev"
 
 compile_rules() {
-	fix math
-
 	mkdir build
 	cd    build
 
@@ -34,22 +38,3 @@
 
 	cook_pick_docs ../glib/reference/html
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		poppler)
-			copy *.so*
-			DEPENDS="cairo fontconfig freetype glib lcms2 libcurl \
-			libjpeg-turbo libpng nspr nss openjpeg2 libtiff zlib"
-			;;
-		*-apps)
-			copy bin/
-			CAT="office|utilities to manipulate PDF file"
-			DEPENDS="cairo freetype lcms2 poppler"
-			;;
-		*-dev)
-			copy @dev @rm
-			DEPENDS="poppler poppler-apps cairo-dev glib-dev"
-			;;
-	esac
-}
diff -r 27d8c72c641f -r 6f5739796e82 python-tempora/receipt
--- a/python-tempora/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/python-tempora/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -9,7 +9,7 @@
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
-REPOLOGY="python:portend"
+REPOLOGY="python:tempora"
 
 BUILD_DEPENDS="python python-jaraco.functools python-pytz python-six \
 python3 python3-jaraco.functools python3-pytz python3-six"
diff -r 27d8c72c641f -r 6f5739796e82 reqflow/receipt
--- a/reqflow/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/reqflow/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpcreposix libxml2 libzip poppler"
+	DEPENDS="libpcreposix libxml2 libzip libpoppler"
 }
diff -r 27d8c72c641f -r 6f5739796e82 tumbler/receipt
--- a/tumbler/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/tumbler/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -67,7 +67,7 @@
 			;;
 		*-poppler)
 			copy tumbler-poppler-thumbnailer.so
-			DEPENDS="cairo gdk-pixbuf glib poppler tumbler"
+			DEPENDS="cairo gdk-pixbuf glib libpoppler tumbler"
 			CAT="graphics|Poppler PDF/PS thumbnailer"
 			;;
 		*-raw)
diff -r 27d8c72c641f -r 6f5739796e82 xournal/receipt
--- a/xournal/receipt	Tue Jan 01 13:46:24 2019 +0200
+++ b/xournal/receipt	Tue Jan 01 15:48:26 2019 +0200
@@ -27,6 +27,6 @@
 	copy @std
 	rm -r $fs/usr/share/mimelnk/
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libart_lgpl \
-	libgnomecanvas pango poppler libx11 zlib" # poppler-apps?
+	libgnomecanvas pango libpoppler libx11 zlib" # poppler?
 	SUGGESTED="ghostscript"
 }