wok-next rev 21140
clisp: fix i486 build with GCC8; up cmake (3.13.3); build hardinfo
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jan 24 13:28:17 2019 +0200 (2019-01-24) |
| parents | 144432922462 |
| children | 59c6b07cb8eb |
| files | clisp/stuff/patches/clisp-gcc8.patch clisp/stuff/patches/series cmake/receipt hardinfo/.icon.png hardinfo/receipt hardinfo/stuff/hardinfo.desktop hardinfo/stuff/patches/debian.patch hardinfo/stuff/patches/desktop.patch hardinfo/stuff/patches/series |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/clisp/stuff/patches/clisp-gcc8.patch Thu Jan 24 13:28:17 2019 +0200 1.3 @@ -0,0 +1,11 @@ 1.4 +--- a/src/makemake.in 1.5 ++++ b/src/makemake.in 1.6 +@@ -1313,7 +1313,7 @@ 1.7 + esac 1.8 + fi # !DEBUGGING 1.9 + case "$XCC_GCC_VERSION" in 1.10 +- 3* | 4*) 1.11 ++ 3* | 4* | 8*) 1.12 + # When not optimizing on linux, or with Apple's gcc 4 on MacOS X, 1.13 + # or with GCC 4 when "gcc -Os" is used: 1.14 + # C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512
2.1 --- a/clisp/stuff/patches/series Thu Jan 24 05:20:16 2019 +0200 2.2 +++ b/clisp/stuff/patches/series Thu Jan 24 13:28:17 2019 +0200 2.3 @@ -4,3 +4,6 @@ 2.4 2.5 # from https://sourceforge.net/p/clisp/bugs/688/ 2.6 -p0|readline.lisp.patch 2.7 + 2.8 +# https://sourceforge.net/p/clisp/bugs/686/ 2.9 +clisp-gcc8.patch
3.1 --- a/cmake/receipt Thu Jan 24 05:20:16 2019 +0200 3.2 +++ b/cmake/receipt Thu Jan 24 13:28:17 2019 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="cmake" 3.7 -VERSION="3.13.2" 3.8 +VERSION="3.13.3" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Cross-platform build system generator" 3.11 MAINTAINER="devel@slitaz.org" 3.12 @@ -11,7 +11,7 @@ 3.13 3.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.15 WGET_URL="http://www.cmake.org/files/v${VERSION%.*}/$TARBALL" 3.16 -TARBALL_SHA1="101b8599b5ddd4df9127e227c3fe13ed3d8e266a" 3.17 +TARBALL_SHA1="f33558a268a9286d4fa310abbd56efbaf897f6dc" 3.18 3.19 BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev expat-dev \ 3.20 ncurses-dev gfortran libuv-dev jsoncpp-dev" 3.21 @@ -32,7 +32,7 @@ 3.22 3.23 compile_rules() { 3.24 sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake 3.25 - fix math 3.26 +# fix math 3.27 3.28 ./bootstrap \ 3.29 --prefix=/usr \
4.1 Binary file hardinfo/.icon.png has changed
5.1 --- a/hardinfo/receipt Thu Jan 24 05:20:16 2019 +0200 5.2 +++ b/hardinfo/receipt Thu Jan 24 13:28:17 2019 +0200 5.3 @@ -1,35 +1,29 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="hardinfo" 5.7 -VERSION="0.5.1" 5.8 +VERSION="0.5.1" # 2009-04-06 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="A tool to get hardware informations and perform benchmarks" 5.11 MAINTAINER="devel@slitaz.org" 5.12 LICENSE="GPL2" 5.13 -WEB_SITE="http://hardinfo.berlios.de/" 5.14 +WEB_SITE="https://github.com/lpereira/hardinfo" 5.15 5.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.17 -WGET_URL="http://download.berlios.de/hardinfo/$TARBALL" 5.18 +WGET_URL="$SF_MIRROR/hardinfo.berlios/$TARBALL" 5.19 +TARBALL_SHA1="983f0445aa60e02156bc5a5eaedeffb30b8e4d64" 5.20 5.21 BUILD_DEPENDS="gtk2-dev" 5.22 +DEPENDS="gdk-pixbuf glib gtk2 pango pciutils" 5.23 5.24 compile_rules() { 5.25 - ./configure \ 5.26 - --prefix=/usr \ 5.27 - $CONFIGURE_ARGS && 5.28 - sed -i 's/^GTK_LIBS.*/& -lgmodule-2.0 -lm/' Makefile && 5.29 + ./configure $CONFIGURE_ARGS && 5.30 + sed -i 's|^GTK_LIBS.*|& -lgmodule-2.0 -lm|' Makefile && 5.31 make && 5.32 - make DESTDIR=$install install 5.33 + make install || return 1 5.34 + 5.35 + rmdir $install/usr/local/ # empty 5.36 + rm $install/usr/share/hardinfo/pixmaps/logo.xcf 5.37 + mkdir -p $install/usr/share/icons/hicolor/48x48/apps/ 5.38 + ln -s ../../../../hardinfo/pixmaps/logo.png \ 5.39 + $install/usr/share/icons/hicolor/48x48/apps/hardinfo.png 5.40 } 5.41 - 5.42 -genpkg_rules() { 5.43 - mkdir -p $fs/usr/lib/$PACKAGE/modules $fs/usr/share/pixmaps 5.44 - cp -a $install/usr/bin $fs/usr 5.45 - cp -a $src/*.so $fs/usr/lib/$PACKAGE/modules 5.46 - cp -a $install/usr/share/$PACKAGE $fs/usr/share 5.47 - 5.48 - cd $fs/usr/share/pixmaps 5.49 - rm ../$PACKAGE/pixmaps/logo.xcf 5.50 - ln -s ../$PACKAGE/pixmaps/logo.png hardinfo.png 5.51 - DEPENDS="gtk2 pciutils libxdamage" 5.52 -}
6.1 --- a/hardinfo/stuff/hardinfo.desktop Thu Jan 24 05:20:16 2019 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,11 +0,0 @@ 6.4 -[Desktop Entry] 6.5 -Type=Application 6.6 -Name=System Information 6.7 -Name[fr]=Informations système 6.8 -Name[pt]=Informações e Testes do Sistema 6.9 -Name[pt_BR]=Informações e Testes do Sistema 6.10 -Name[ru]=Информация о системе 6.11 -Exec=hardinfo 6.12 -Icon=hardinfo 6.13 -StartupNotify=true 6.14 -Categories=System
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/hardinfo/stuff/patches/debian.patch Thu Jan 24 13:28:17 2019 +0200 7.3 @@ -0,0 +1,54 @@ 7.4 +Combined patches from Debian (hardinfo_0.5.1-1.5) 7.5 + 7.6 +--- a/binreloc.c 7.7 ++++ b/binreloc.c 7.8 +@@ -594,7 +594,7 @@ 7.9 + } 7.10 + 7.11 + #ifdef ARCH_x86_64 7.12 +- dir = g_build_filename(prefix, "lib64", NULL); 7.13 ++ dir = g_build_filename(prefix, "lib", NULL); 7.14 + #else 7.15 + dir = g_build_filename(prefix, "lib", NULL); 7.16 + #endif 7.17 +--- a/config.h 7.18 ++++ b/config.h 7.19 +@@ -0,0 +1,17 @@ 7.20 ++#ifndef __CONFIG_H__ 7.21 ++#define __CONFIG_H__ 7.22 ++ 7.23 ++#define VERSION "0.5.1" 7.24 ++#define ARCH_i386 7.25 ++#define ARCH "ARCH_i386" 7.26 ++#define PLATFORM "Linux" 7.27 ++#define KERNEL "2.6.30-1-686" 7.28 ++#define HOSTNAME "comanche" 7.29 ++#define PREFIX "/usr/share/hardinfo/" 7.30 ++#define LIBPREFIX "/usr/lib/hardinfo/" 7.31 ++#define HAS_LINUX_WE 7.32 ++#define DEBUG(...) 7.33 ++#define ENABLE_BINRELOC 1 7.34 ++#define RELEASE 1 7.35 ++ 7.36 ++#endif /* __CONFIG_H__ */ 7.37 +--- a/configure 7.38 ++++ b/configure 7.39 +@@ -56,7 +56,7 @@ 7.40 + x86_64) 7.41 + ln -sf linux/x86_64 arch/this 7.42 + ARCH="ARCH_x86_64" 7.43 +- LIBDIR="/usr/lib64" ;; 7.44 ++ LIBDIR="/usr/lib" ;; 7.45 + mips*) 7.46 + ln -sf linux/mips arch/this 7.47 + ARCH="ARCH_MIPS" ;; 7.48 +--- a/Makefile.in 7.49 ++++ b/Makefile.in 7.50 +@@ -1,6 +1,6 @@ 7.51 + 7.52 + CCFLAGS = -fPIC -pipe -Wall -g 7.53 +-CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. 7.54 ++CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89 7.55 + CC = gcc $(ARCHOPTS) -g 7.56 + CCSLOW = gcc -O0 -g 7.57 +
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/hardinfo/stuff/patches/desktop.patch Thu Jan 24 13:28:17 2019 +0200 8.3 @@ -0,0 +1,14 @@ 8.4 +--- a/hardinfo.desktop 8.5 ++++ b/hardinfo.desktop 8.6 +@@ -1,8 +1,10 @@ 8.7 + [Desktop Entry] 8.8 + Name=System Profiler and Benchmark 8.9 ++Name[fr]=Informations système 8.10 + Name[pt_BR]=Informações e Testes do Sistema 8.11 ++Name[ru]=Информация о системе 8.12 + Exec=hardinfo 8.13 +-Icon=/usr/share/hardinfo/pixmaps/logo.png 8.14 ++Icon=hardinfo 8.15 + Terminal=false 8.16 + Type=Application 8.17 + StartupNotify=true