wok-next rev 20870
bleachbit: up (2.0); fbxkb and foobillardplus: fix build; add jdupes
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Jul 02 15:13:13 2018 +0300 (2018-07-02) |
| parents | b7b6a40f3cb4 |
| children | fa61cfb16a25 |
| files | bleachbit/receipt fbxkb/receipt fbxkb/stuff/patches/fbxkb.patch foobillardplus/.icon.png foobillardplus/receipt foobillardplus/stuff/foobillardplus.desktop foobillardplus/stuff/patches/desktop.patch foobillardplus/stuff/patches/extern.patch foobillardplus/stuff/patches/series jdupes/receipt |
line diff
1.1 --- a/bleachbit/receipt Mon Jul 02 10:15:48 2018 +0300 1.2 +++ b/bleachbit/receipt Mon Jul 02 15:13:13 2018 +0300 1.3 @@ -1,29 +1,25 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="bleachbit" 1.8 -VERSION="0.9.4" 1.9 +VERSION="2.0" 1.10 CATEGORY="system-tools" 1.11 SHORT_DESC="Deletes unneeded files to free disk space and maintain privacy" 1.12 MAINTAINER="devl547@gmail.com" 1.13 LICENSE="GPL3" 1.14 +WEB_SITE="https://www.bleachbit.org/" 1.15 +# see also: https://github.com/bleachbit/bleachbit 1.16 + 1.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.18 -WEB_SITE="http://bleachbit.sourceforge.net/" 1.19 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.20 +WGET_URL="https://download.bleachbit.org/$TARBALL" 1.21 1.22 -DEPENDS="pygtk python" 1.23 BUILD_DEPENDS="python gettext-tools" 1.24 1.25 -# Rules to configure and make the package. 1.26 -compile_rules() 1.27 -{ 1.28 +compile_rules() { 1.29 make -C po local && 1.30 make prefix=/usr DESTDIR=$DESTDIR install 1.31 } 1.32 1.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.34 -genpkg_rules() 1.35 -{ 1.36 - mkdir -p $fs/usr/ 1.37 - cp -a $install/usr/bin $fs/usr 1.38 - cp -a $install/usr/share $fs/usr 1.39 +genpkg_rules() { 1.40 + copy @std 1.41 + DEPENDS="pygtk python" 1.42 }
2.1 --- a/fbxkb/receipt Mon Jul 02 10:15:48 2018 +0300 2.2 +++ b/fbxkb/receipt Mon Jul 02 15:13:13 2018 +0300 2.3 @@ -14,14 +14,9 @@ 2.4 BUILD_DEPENDS="gtk+-dev xorg-libXmu-dev" 2.5 2.6 compile_rules() { 2.7 - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11" 2.8 - 2.9 ./configure && 2.10 - make || return 1 2.11 - 2.12 - install -Dm755 $src/fbxkb $install/usr/bin/fbxkb 2.13 - mkdir -p $install/usr/share/fbxkb/images 2.14 - cp $src/images/*.png $install/usr/share/fbxkb/images 2.15 + make LDFLAGS= && 2.16 + make PREFIX=$install/usr install 2.17 } 2.18 2.19 genpkg_rules() {
3.1 --- a/fbxkb/stuff/patches/fbxkb.patch Mon Jul 02 10:15:48 2018 +0300 3.2 +++ b/fbxkb/stuff/patches/fbxkb.patch Mon Jul 02 15:13:13 2018 +0300 3.3 @@ -15,14 +15,23 @@ 3.4 } 3.5 XFree(sym_name); 3.6 } 3.7 ---- fbxkb-0.6.orig/Makefile.common 2004-10-15 22:18:59.000000000 +0000 3.8 -+++ fbxkb-0.6/Makefile.common 2010-11-02 13:35:02.593908176 +0000 3.9 -@@ -25,7 +25,7 @@ 3.10 +--- a/Makefile.common 2004-10-16 01:18:59.000000000 +0300 3.11 ++++ b/Makefile.common 2012-01-15 23:20:02.081020564 +0200 3.12 +@@ -16,7 +16,7 @@ endif 3.13 endif 3.14 - 3.15 - # -DGTK_DISABLE_DEPRECATED does not work yet 3.16 + 3.17 + CC = gcc 3.18 +-LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu 3.19 ++LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib -lXmu 3.20 + INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) 3.21 + CFLAGS = -O2 # overwriten by command line or env. variable 3.22 + CFLAGS += -Wall # always nice to have 3.23 +@@ -24,9 +24,6 @@ ifneq (,$(DEVEL)) 3.24 + CFLAGS := -g -Wall 3.25 + endif 3.26 + 3.27 +-# -DGTK_DISABLE_DEPRECATED does not work yet 3.28 -CFLAGS += -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 3.29 -+CFLAGS += -g 3.30 - 3.31 +- 3.32 %.o: %.c 3.33 - $(CC) $(CFLAGS) $(INCS) -c $< 3.34 + $(CC) $(CFLAGS) $(INCS) -c $<
4.1 Binary file foobillardplus/.icon.png has changed
5.1 --- a/foobillardplus/receipt Mon Jul 02 10:15:48 2018 +0300 5.2 +++ b/foobillardplus/receipt Mon Jul 02 15:13:13 2018 +0300 5.3 @@ -7,45 +7,51 @@ 5.4 MAINTAINER="al.bobylev@gmail.com" 5.5 LICENSE="GPL2" 5.6 WEB_SITE="http://foobillard.sourceforge.net/" 5.7 + 5.8 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.9 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 5.10 5.11 -DEPENDS="bzlib freetype glu libpng16 libsdl-mixer libsdl-net" 5.12 +BUILD_DEPENDS="automake autoconf libsdl-dev libsdl-mixer-dev libsdl-net-dev \ 5.13 +mesa-dev glu-dev freetype-dev libpng16-dev" 5.14 +SPLIT="foobillardplus-music foobillardplus" 5.15 5.16 -BUILD_DEPENDS="bash automake autoconf libsdl-dev libsdl-mixer-dev \ 5.17 -libsdl-net-dev mesa-dev glu freetype-dev libpng16-dev glu-dev" 5.18 -SPLIT="foobillardplus foobillardplus-music" 5.19 - 5.20 -# Rules to configure and make the package. 5.21 -compile_rules() 5.22 -{ 5.23 +compile_rules() { 5.24 aclocal --force 5.25 autoconf -f 5.26 autoheader -f 5.27 automake --gnu -a -c -f 5.28 + 5.29 ./configure && 5.30 - make 5.31 + make || return 1 5.32 + 5.33 + # there's an /opt style install, it's better to write it here rather than patch everything there 5.34 + fbdir='/usr/share/foobillardplus' 5.35 + 5.36 + install -Dm755 src/foobillardplus $install$fbdir/bin/foobillardplus # bin need to be here 5.37 + mkdir -p $install/usr/bin/ 5.38 + ln -s $fbdir/bin/foobillardplus $install/usr/bin/foobillardplus 5.39 + fix symlinks 5.40 + 5.41 + mkdir -p $install$fbdir/ 5.42 + cp -R data/* $install$fbdir/ 5.43 + sed -i 's|firefox|browser|' $install$fbdir/browser.sh # use SliTaz browser 5.44 + 5.45 + install -Dm644 foobillardplus.desktop $install/usr/share/applications/foobillardplus.desktop 5.46 + install -Dm644 foobillardplus.png $install/usr/share/icons/hicolor/128x128/apps/foobillardplus.png 5.47 + 5.48 + find $install \( -name '*.ttf' -o -name '*.ico' \) -delete 5.49 } 5.50 5.51 -# Rules to gen a SliTaz package suitable for Tazpkg. 5.52 -genpkg_rules() 5.53 -{ 5.54 +genpkg_rules() { 5.55 case $PACKAGE in 5.56 - foobillardplus) 5.57 - mkdir -p $fs/usr/bin $fs/usr/share/foobillardplus 5.58 - cp -a $src/src/foobillardplus $fs/usr/bin 5.59 - DATADIR=$fs/usr/share/foobillardplus 5.60 - cp -a $src/data/* $DATADIR 5.61 - rm -f $DATADIR/*.ttf 5.62 - rm -f $DATADIR/*.ico 5.63 - # move to package foobillardplus-music 5.64 - rm -rf $DATADIR/music 5.65 - ;; 5.66 - foobillardplus-music) 5.67 - CAT="games|Music files for FooBillard++" 5.68 - DEPENDS="foobillardplus" 5.69 - mkdir -p $fs/usr/share/foobillardplus 5.70 - cp -a $src/data/music $fs/usr/share/foobillardplus 5.71 - ;; 5.72 + foobillardplus-music) 5.73 + copy music/ 5.74 + CAT="games|music files" 5.75 + DEPENDS="foobillardplus" 5.76 + ;; 5.77 + foobillardplus) 5.78 + copy @std @rm hicolor/ # 128px icons isn't copied with @std 5.79 + DEPENDS="freetype glu libpng16 libsdl libsdl-mixer libsdl-net mesa" 5.80 + ;; 5.81 esac 5.82 }
6.1 --- a/foobillardplus/stuff/foobillardplus.desktop Mon Jul 02 10:15:48 2018 +0300 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,10 +0,0 @@ 6.4 -[Desktop Entry] 6.5 -Type=Application 6.6 -Name=Foobillard++ 6.7 -GenericName=OpenGL Billiard Game 6.8 -Comment=OpenGL Billiard Game 6.9 -Comment[ru]=Бильярд на OpenGL 6.10 -Exec=foobillardplus 6.11 -Terminal=false 6.12 -Icon=/usr/share/foobillardplus/foobillardplus.png 6.13 -Categories=Game;SportsGame;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/foobillardplus/stuff/patches/desktop.patch Mon Jul 02 15:13:13 2018 +0300 7.3 @@ -0,0 +1,17 @@ 7.4 +--- a/foobillardplus.desktop 7.5 ++++ b/foobillardplus.desktop 7.6 +@@ -3,10 +3,10 @@ 7.7 + Version=1.0 7.8 + Type=Application 7.9 + Terminal=false 7.10 +-Icon=/opt/foobillardplus/foobillardplus.png 7.11 ++Icon=foobillardplus 7.12 + Name=Foobillard++ 7.13 +-Exec=/opt/foobillardplus/bin/foobillardplus 7.14 ++Exec=foobillardplus 7.15 + Comment=OpenGL Billiard Game 7.16 +-Name=Foobillard++ 7.17 +-Comment=OpenGL Billiard Game 7.18 ++Comment[ru]=Бильярд на OpenGL 7.19 + GenericName=OpenGL Billiard Game 7.20 ++Categories=Game;SportsGame;
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/foobillardplus/stuff/patches/extern.patch Mon Jul 02 15:13:13 2018 +0300 8.3 @@ -0,0 +1,38 @@ 8.4 +--- a/src/vmath.c 8.5 ++++ b/src/vmath.c 8.6 +@@ -52,7 +52,7 @@ 8.7 + /*********************************************************************** 8.8 + * fast sinus implementation lookup table * 8.9 + ***********************************************************************/ 8.10 +-inline float fastsin(float n) { 8.11 ++extern inline float fastsin(float n) { 8.12 + float f = n * HALF_MAX_CIRCLE_ANGLE / M_PI; 8.13 + int i; 8.14 + i = (int)f; 8.15 +@@ -67,7 +67,7 @@ 8.16 + * fast cosinus implementation lookup table * 8.17 + ***********************************************************************/ 8.18 + 8.19 +-inline float fastcos(float n) { 8.20 ++extern inline float fastcos(float n) { 8.21 + float f = n * HALF_MAX_CIRCLE_ANGLE / M_PI; 8.22 + int i; 8.23 + i = (int)f; 8.24 +@@ -82,7 +82,7 @@ 8.25 + * fast atan implementation * 8.26 + ***********************************************************************/ 8.27 + 8.28 +-inline float fastatan(float x) 8.29 ++extern inline float fastatan(float x) 8.30 + { 8.31 + return M_PI_4*x - x*(fabs(x) - 1)*(0.2447 + 0.0663*fabs(x)); 8.32 + } 8.33 +@@ -92,7 +92,7 @@ 8.34 + * fast atan2 implementation * 8.35 + ***********************************************************************/ 8.36 + 8.37 +-inline float fastatan2(float y, float x) { 8.38 ++extern inline float fastatan2(float y, float x) { 8.39 + float coeff_1 = M_PI / 4.0f; 8.40 + float coeff_2 = 3.0f * coeff_1; 8.41 + float abs_y = abs(y);
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/foobillardplus/stuff/patches/series Mon Jul 02 15:13:13 2018 +0300 9.3 @@ -0,0 +1,2 @@ 9.4 +extern.patch 9.5 +desktop.patch
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/jdupes/receipt Mon Jul 02 15:13:13 2018 +0300 10.3 @@ -0,0 +1,21 @@ 10.4 +# SliTaz package receipt v2. 10.5 + 10.6 +PACKAGE="jdupes" 10.7 +VERSION="1.10.2" 10.8 +CATEGORY="development" 10.9 +SHORT_DESC="A powerful duplicate file finder and an enhanced fork of 'fdupes'" 10.10 +MAINTAINER="al.bobylev@gmail.com" 10.11 +LICENSE="MIT" 10.12 +WEB_SITE="https://github.com/jbruchon/jdupes/" 10.13 + 10.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 10.15 +WGET_URL="https://github.com/jbruchon/jdupes/archive/v$VERSION.tar.gz" 10.16 + 10.17 +compile_rules() { 10.18 + make && 10.19 + make install 10.20 +} 10.21 + 10.22 +genpkg_rules() { 10.23 + copy @std 10.24 +}