wok-next rev 20852

Fix build: xplc, xournal
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 24 17:58:25 2018 +0300 (2018-06-24)
parents baaa04032e25
children 659d94ea297b
files xgalaga/receipt xournal/.icon.png xournal/receipt xournal/stuff/patches/series xournal/stuff/patches/xournal.patch xplc/receipt
line diff
     1.1 --- a/xgalaga/receipt	Sun Jun 24 16:46:03 2018 +0300
     1.2 +++ b/xgalaga/receipt	Sun Jun 24 17:58:25 2018 +0300
     1.3 @@ -9,6 +9,7 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.5  WEB_SITE="http://sourceforge.net/projects/xgalaga/"
     1.6  WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
     1.7 +HOST_ARCH="i486"
     1.8  
     1.9  DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm xorg-libxcb \
    1.10  xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
     2.1 Binary file xournal/.icon.png has changed
     3.1 --- a/xournal/receipt	Sun Jun 24 16:46:03 2018 +0300
     3.2 +++ b/xournal/receipt	Sun Jun 24 17:58:25 2018 +0300
     3.3 @@ -1,41 +1,32 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="xournal"
     3.8  VERSION="0.4.7"
     3.9  CATEGORY="utilities"
    3.10 -SHORT_DESC="Notetaking application."
    3.11 +SHORT_DESC="Notetaking application"
    3.12  MAINTAINER="meshca@clarkson.edu"
    3.13  LICENSE="GPL2"
    3.14 -SUGGESTED="ghostscript"
    3.15 +WEB_SITE="http://xournal.sourceforge.net/"
    3.16 +
    3.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.18 -WEB_SITE="http://xournal.sourceforge.net/"
    3.19  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    3.20  
    3.21 -DEPENDS="gtk+ libgnomecanvas poppler poppler-apps gcc-lib-base"
    3.22 -BUILD_DEPENDS="autoconf automake gtk+-dev libgnomecanvas libgnomecanvas-dev \
    3.23 -poppler poppler-dev zlib-dev libart_lgpl-dev"
    3.24 +BUILD_DEPENDS="autoconf automake gtk+-dev libgnomecanvas-dev poppler-dev \
    3.25 +zlib-dev libart_lgpl-dev gettext"
    3.26  
    3.27 -# Rules to configure and make the package.
    3.28 -compile_rules()
    3.29 -{
    3.30 -	CFLAGS="$CFLAGS `pkg-config --cflags --libs gtk+-2.0` `pkg-config --libs x11` -lm -lz"
    3.31 -#	wget http://people.slitaz.org/~naitsirhc/xournal.patch && \
    3.32 -#	patch -p1 -i xournal.patch && 
    3.33 -	./configure \
    3.34 -		--prefix=/usr \
    3.35 -		--infodir=/usr/share/info \
    3.36 -		--mandir=/usr/share/man \
    3.37 -		$CONFIGURE_ARGS &&
    3.38 -	make && make DESTDIR=$DESTDIR install && make DESTDIR=$DESTDIR desktop-install	
    3.39 +compile_rules() {
    3.40 +	CFLAGS="$CFLAGS $(pkg-config --cflags --libs gtk+-2.0 x11) -lm -lz"
    3.41 +
    3.42 +	./configure $CONFIGURE_ARGS &&
    3.43 +	make &&
    3.44 +	make DESTDIR=$DESTDIR install &&
    3.45 +	make DESTDIR=$DESTDIR desktop-install
    3.46  }
    3.47  
    3.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.49 -genpkg_rules()
    3.50 -{
    3.51 -	mkdir -p $fs/usr/share
    3.52 -
    3.53 -	cp -a $install/usr/bin $fs/usr
    3.54 -	cp -a $install/usr/share/icons $fs/usr/share
    3.55 -	cp -a $install/usr/share/xournal $fs/usr/share
    3.56 +genpkg_rules() {
    3.57 +	copy @std
    3.58 +	rm -r $fs/usr/share/mimelnk/
    3.59 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libart_lgpl \
    3.60 +	libgnomecanvas pango poppler xorg-libX11 zlib" # poppler-apps?
    3.61 +	SUGGESTED="ghostscript"
    3.62  }
    3.63 -
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xournal/stuff/patches/series	Sun Jun 24 17:58:25 2018 +0300
     4.3 @@ -0,0 +1,1 @@
     4.4 +xournal.patch
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/xournal/stuff/patches/xournal.patch	Sun Jun 24 17:58:25 2018 +0300
     5.3 @@ -0,0 +1,11 @@
     5.4 +--- a/src/xo-shapes.c
     5.5 ++++ b/src/xo-shapes.c
     5.6 +@@ -107,7 +107,7 @@
     5.7 +   return sqrt(ixx+iyy);
     5.8 + }
     5.9 + 
    5.10 +-inline double I_det(struct Inertia s)
    5.11 ++extern inline double I_det(struct Inertia s)
    5.12 + {
    5.13 +   double ixx = I_xx(s), iyy = I_yy(s), ixy = I_xy(s);
    5.14 +   if (s.mass <= 0.) return 0.;
     6.1 --- a/xplc/receipt	Sun Jun 24 16:46:03 2018 +0300
     6.2 +++ b/xplc/receipt	Sun Jun 24 17:58:25 2018 +0300
     6.3 @@ -14,9 +14,9 @@
     6.4  SPLIT="xplc-dev"
     6.5  
     6.6  compile_rules() {
     6.7 +	export LDFLAGS='-ldl' # avoid '--as-needed' for old code
     6.8 +
     6.9  	./configure \
    6.10 -		--prefix=/usr \
    6.11 -		--mandir=/usr/share/man \
    6.12  		--without-libuuid \
    6.13  		$CONFIGURE_ARGS &&
    6.14  	make &&
    6.15 @@ -26,8 +26,7 @@
    6.16  genpkg_rules() {
    6.17  	case $PACKAGE in
    6.18  		xplc)
    6.19 -			copy @std
    6.20 -			rm -f $fs/usr/bin/uuidgen
    6.21 +			copy *.so* # exclude /usr/bin/uuidgen, /usr/bin/uuidcdef
    6.22  			DEPENDS="gcc-lib-base"
    6.23  			;;
    6.24  		*-dev)