# HG changeset patch # User Aleksej Bobylev # Date 1548329297 -7200 # Node ID 6618ed2803f72d3efb0190f8d7ba740ecd6595f9 # Parent 144432922462d848be36d783bf0ddeababff9362 clisp: fix i486 build with GCC8; up cmake (3.13.3); build hardinfo diff -r 144432922462 -r 6618ed2803f7 clisp/stuff/patches/clisp-gcc8.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clisp/stuff/patches/clisp-gcc8.patch Thu Jan 24 13:28:17 2019 +0200 @@ -0,0 +1,11 @@ +--- a/src/makemake.in ++++ b/src/makemake.in +@@ -1313,7 +1313,7 @@ + esac + fi # !DEBUGGING + case "$XCC_GCC_VERSION" in +- 3* | 4*) ++ 3* | 4* | 8*) + # When not optimizing on linux, or with Apple's gcc 4 on MacOS X, + # or with GCC 4 when "gcc -Os" is used: + # C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512 diff -r 144432922462 -r 6618ed2803f7 clisp/stuff/patches/series --- a/clisp/stuff/patches/series Thu Jan 24 05:20:16 2019 +0200 +++ b/clisp/stuff/patches/series Thu Jan 24 13:28:17 2019 +0200 @@ -4,3 +4,6 @@ # from https://sourceforge.net/p/clisp/bugs/688/ -p0|readline.lisp.patch + +# https://sourceforge.net/p/clisp/bugs/686/ +clisp-gcc8.patch diff -r 144432922462 -r 6618ed2803f7 cmake/receipt --- a/cmake/receipt Thu Jan 24 05:20:16 2019 +0200 +++ b/cmake/receipt Thu Jan 24 13:28:17 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="cmake" -VERSION="3.13.2" +VERSION="3.13.3" CATEGORY="development" SHORT_DESC="Cross-platform build system generator" MAINTAINER="devel@slitaz.org" @@ -11,7 +11,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="http://www.cmake.org/files/v${VERSION%.*}/$TARBALL" -TARBALL_SHA1="101b8599b5ddd4df9127e227c3fe13ed3d8e266a" +TARBALL_SHA1="f33558a268a9286d4fa310abbd56efbaf897f6dc" BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev expat-dev \ ncurses-dev gfortran libuv-dev jsoncpp-dev" @@ -32,7 +32,7 @@ compile_rules() { sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake - fix math +# fix math ./bootstrap \ --prefix=/usr \ diff -r 144432922462 -r 6618ed2803f7 hardinfo/.icon.png Binary file hardinfo/.icon.png has changed diff -r 144432922462 -r 6618ed2803f7 hardinfo/receipt --- a/hardinfo/receipt Thu Jan 24 05:20:16 2019 +0200 +++ b/hardinfo/receipt Thu Jan 24 13:28:17 2019 +0200 @@ -1,35 +1,29 @@ # SliTaz package receipt. PACKAGE="hardinfo" -VERSION="0.5.1" +VERSION="0.5.1" # 2009-04-06 CATEGORY="system-tools" SHORT_DESC="A tool to get hardware informations and perform benchmarks" MAINTAINER="devel@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://hardinfo.berlios.de/" +WEB_SITE="https://github.com/lpereira/hardinfo" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="http://download.berlios.de/hardinfo/$TARBALL" +WGET_URL="$SF_MIRROR/hardinfo.berlios/$TARBALL" +TARBALL_SHA1="983f0445aa60e02156bc5a5eaedeffb30b8e4d64" BUILD_DEPENDS="gtk2-dev" +DEPENDS="gdk-pixbuf glib gtk2 pango pciutils" compile_rules() { - ./configure \ - --prefix=/usr \ - $CONFIGURE_ARGS && - sed -i 's/^GTK_LIBS.*/& -lgmodule-2.0 -lm/' Makefile && + ./configure $CONFIGURE_ARGS && + sed -i 's|^GTK_LIBS.*|& -lgmodule-2.0 -lm|' Makefile && make && - make DESTDIR=$install install + make install || return 1 + + rmdir $install/usr/local/ # empty + rm $install/usr/share/hardinfo/pixmaps/logo.xcf + mkdir -p $install/usr/share/icons/hicolor/48x48/apps/ + ln -s ../../../../hardinfo/pixmaps/logo.png \ + $install/usr/share/icons/hicolor/48x48/apps/hardinfo.png } - -genpkg_rules() { - mkdir -p $fs/usr/lib/$PACKAGE/modules $fs/usr/share/pixmaps - cp -a $install/usr/bin $fs/usr - cp -a $src/*.so $fs/usr/lib/$PACKAGE/modules - cp -a $install/usr/share/$PACKAGE $fs/usr/share - - cd $fs/usr/share/pixmaps - rm ../$PACKAGE/pixmaps/logo.xcf - ln -s ../$PACKAGE/pixmaps/logo.png hardinfo.png - DEPENDS="gtk2 pciutils libxdamage" -} diff -r 144432922462 -r 6618ed2803f7 hardinfo/stuff/hardinfo.desktop --- a/hardinfo/stuff/hardinfo.desktop Thu Jan 24 05:20:16 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=System Information -Name[fr]=Informations système -Name[pt]=Informações e Testes do Sistema -Name[pt_BR]=Informações e Testes do Sistema -Name[ru]=Информация о системе -Exec=hardinfo -Icon=hardinfo -StartupNotify=true -Categories=System diff -r 144432922462 -r 6618ed2803f7 hardinfo/stuff/patches/debian.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hardinfo/stuff/patches/debian.patch Thu Jan 24 13:28:17 2019 +0200 @@ -0,0 +1,54 @@ +Combined patches from Debian (hardinfo_0.5.1-1.5) + +--- a/binreloc.c ++++ b/binreloc.c +@@ -594,7 +594,7 @@ + } + + #ifdef ARCH_x86_64 +- dir = g_build_filename(prefix, "lib64", NULL); ++ dir = g_build_filename(prefix, "lib", NULL); + #else + dir = g_build_filename(prefix, "lib", NULL); + #endif +--- a/config.h ++++ b/config.h +@@ -0,0 +1,17 @@ ++#ifndef __CONFIG_H__ ++#define __CONFIG_H__ ++ ++#define VERSION "0.5.1" ++#define ARCH_i386 ++#define ARCH "ARCH_i386" ++#define PLATFORM "Linux" ++#define KERNEL "2.6.30-1-686" ++#define HOSTNAME "comanche" ++#define PREFIX "/usr/share/hardinfo/" ++#define LIBPREFIX "/usr/lib/hardinfo/" ++#define HAS_LINUX_WE ++#define DEBUG(...) ++#define ENABLE_BINRELOC 1 ++#define RELEASE 1 ++ ++#endif /* __CONFIG_H__ */ +--- a/configure ++++ b/configure +@@ -56,7 +56,7 @@ + x86_64) + ln -sf linux/x86_64 arch/this + ARCH="ARCH_x86_64" +- LIBDIR="/usr/lib64" ;; ++ LIBDIR="/usr/lib" ;; + mips*) + ln -sf linux/mips arch/this + ARCH="ARCH_MIPS" ;; +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,6 +1,6 @@ + + CCFLAGS = -fPIC -pipe -Wall -g +-CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. ++CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89 + CC = gcc $(ARCHOPTS) -g + CCSLOW = gcc -O0 -g + diff -r 144432922462 -r 6618ed2803f7 hardinfo/stuff/patches/desktop.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hardinfo/stuff/patches/desktop.patch Thu Jan 24 13:28:17 2019 +0200 @@ -0,0 +1,14 @@ +--- a/hardinfo.desktop ++++ b/hardinfo.desktop +@@ -1,8 +1,10 @@ + [Desktop Entry] + Name=System Profiler and Benchmark ++Name[fr]=Informations système + Name[pt_BR]=Informações e Testes do Sistema ++Name[ru]=Информация о системе + Exec=hardinfo +-Icon=/usr/share/hardinfo/pixmaps/logo.png ++Icon=hardinfo + Terminal=false + Type=Application + StartupNotify=true diff -r 144432922462 -r 6618ed2803f7 hardinfo/stuff/patches/series --- a/hardinfo/stuff/patches/series Thu Jan 24 05:20:16 2019 +0200 +++ b/hardinfo/stuff/patches/series Thu Jan 24 13:28:17 2019 +0200 @@ -1,2 +1,4 @@ -p0|languages.patch -p0|os.patch +debian.patch +desktop.patch