# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1529852305 -10800
# Node ID 81b782d366186b3af7fd4261d180972b7b01fce8
# Parent  baaa04032e25ae6e3e57c0058d99288ef707acdc
Fix build: xplc, xournal

diff -r baaa04032e25 -r 81b782d36618 xgalaga/receipt
--- a/xgalaga/receipt	Sun Jun 24 16:46:03 2018 +0300
+++ b/xgalaga/receipt	Sun Jun 24 17:58:25 2018 +0300
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://sourceforge.net/projects/xgalaga/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+HOST_ARCH="i486"
 
 DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm xorg-libxcb \
 xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
diff -r baaa04032e25 -r 81b782d36618 xournal/.icon.png
Binary file xournal/.icon.png has changed
diff -r baaa04032e25 -r 81b782d36618 xournal/receipt
--- a/xournal/receipt	Sun Jun 24 16:46:03 2018 +0300
+++ b/xournal/receipt	Sun Jun 24 17:58:25 2018 +0300
@@ -1,41 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xournal"
 VERSION="0.4.7"
 CATEGORY="utilities"
-SHORT_DESC="Notetaking application."
+SHORT_DESC="Notetaking application"
 MAINTAINER="meshca@clarkson.edu"
 LICENSE="GPL2"
-SUGGESTED="ghostscript"
+WEB_SITE="http://xournal.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://xournal.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ libgnomecanvas poppler poppler-apps gcc-lib-base"
-BUILD_DEPENDS="autoconf automake gtk+-dev libgnomecanvas libgnomecanvas-dev \
-poppler poppler-dev zlib-dev libart_lgpl-dev"
+BUILD_DEPENDS="autoconf automake gtk+-dev libgnomecanvas-dev poppler-dev \
+zlib-dev libart_lgpl-dev gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	CFLAGS="$CFLAGS `pkg-config --cflags --libs gtk+-2.0` `pkg-config --libs x11` -lm -lz"
-#	wget http://people.slitaz.org/~naitsirhc/xournal.patch && \
-#	patch -p1 -i xournal.patch && 
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install && make DESTDIR=$DESTDIR desktop-install	
+compile_rules() {
+	CFLAGS="$CFLAGS $(pkg-config --cflags --libs gtk+-2.0 x11) -lm -lz"
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install &&
+	make DESTDIR=$DESTDIR desktop-install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/icons $fs/usr/share
-	cp -a $install/usr/share/xournal $fs/usr/share
+genpkg_rules() {
+	copy @std
+	rm -r $fs/usr/share/mimelnk/
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libart_lgpl \
+	libgnomecanvas pango poppler xorg-libX11 zlib" # poppler-apps?
+	SUGGESTED="ghostscript"
 }
-
diff -r baaa04032e25 -r 81b782d36618 xournal/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xournal/stuff/patches/series	Sun Jun 24 17:58:25 2018 +0300
@@ -0,0 +1,1 @@
+xournal.patch
diff -r baaa04032e25 -r 81b782d36618 xournal/stuff/patches/xournal.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xournal/stuff/patches/xournal.patch	Sun Jun 24 17:58:25 2018 +0300
@@ -0,0 +1,11 @@
+--- a/src/xo-shapes.c
++++ b/src/xo-shapes.c
+@@ -107,7 +107,7 @@
+   return sqrt(ixx+iyy);
+ }
+ 
+-inline double I_det(struct Inertia s)
++extern inline double I_det(struct Inertia s)
+ {
+   double ixx = I_xx(s), iyy = I_yy(s), ixy = I_xy(s);
+   if (s.mass <= 0.) return 0.;
diff -r baaa04032e25 -r 81b782d36618 xplc/receipt
--- a/xplc/receipt	Sun Jun 24 16:46:03 2018 +0300
+++ b/xplc/receipt	Sun Jun 24 17:58:25 2018 +0300
@@ -14,9 +14,9 @@
 SPLIT="xplc-dev"
 
 compile_rules() {
+	export LDFLAGS='-ldl' # avoid '--as-needed' for old code
+
 	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
 		--without-libuuid \
 		$CONFIGURE_ARGS &&
 	make &&
@@ -26,8 +26,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		xplc)
-			copy @std
-			rm -f $fs/usr/bin/uuidgen
+			copy *.so* # exclude /usr/bin/uuidgen, /usr/bin/uuidcdef
 			DEPENDS="gcc-lib-base"
 			;;
 		*-dev)