Miroirs/msb
1
0
Fork 0
mirror of https://gitlab.com/mateslackbuilds/msb.git synced 2024-12-25 21:59:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libindicator: Upgraded to 16.10.0.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2019-09-26 10:38:34 +07:00 committed by Willy Sudiarto Raharjo
parent 132c71fb23
commit 47f2c8fc71
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 225 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
testing/libindicator/libindicator.SlackBuild
View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libindicator
VERSION=${VERSION:-12.10.1}
VERSION=${VERSION:-16.10.0+18.04.20180321.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_msb}
@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then
esac
fi
wget -c https://launchpad.net/$PRGNAM/12.10/$VERSION/+download/$PRGNAM-$VERSION.tar.gz
wget -c https://launchpad.net/ubuntu/+archive/primary/+files/libindicator_16.10.0+18.04.20180321.1.orig.tar.gz
CWD=$(pwd)
TMP=${TMP:-/tmp/msb}
@ -65,8 +65,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
mkdir -p $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -74,12 +75,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
sed '/-Werror/s/$/ -Wno-deprecated-declarations/' -i libindicator/Makefile.{am,in}
sed 's/LIBINDICATOR_LIBS+="$LIBM"/LIBINDICATOR_LIBS+=" $LIBM"/g' -i configure
sed 's/LIBM="-lmw"/LIBM=" -lmw"/g' -i configure
sed 's/LIBM="-lm"/LIBM=" -lm"/g' -i configure
sed 's/LIBS="-lm $LIBS"/LIBS=" -lm $LIBS"/g' -i configure
sed 's/LIBS="-lmw $LIBS"/LIBS=" -lmw $LIBS"/g' -i configure
patch -p1 < $CWD/libindicator.patch
export CFLAGS+=" -Wno-error=deprecated-declarations"
autoreconf -vfi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@ -95,14 +94,15 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-tests \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
make -j1 -C data install DESTDIR=$PKG
make -j1 -C libindicator install DESTDIR=$PKG
make -j1 -C tools install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install

213
testing/libindicator/libindicator.patch Normal file
View file

@ -0,0 +1,213 @@
commit ce4654550ca72c1fd0ddd93bd36ee7562314b02d
Author: Matthias Klose <doko@ubuntu.com>
Date: Tue Sep 3 18:14:42 2019 +0200
Import patches-unapplied version 16.10.0+18.04.20180321.1-0ubuntu3 to ubuntu/eoan-proposed
Imported using git-ubuntu import.
Changelog parent: b7f44f0040f0e9b62bca17a25ca1c8923a20fed5
New changelog entries:
* Don't build with -Werror.
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index a3e58d7..4bbfd0b 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -65,7 +65,7 @@ libindicator_la_CFLAGS = \
$(LIBINDICATOR_CFLAGS) \
$(COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\"libindicator\" \
- -Wall -Werror -Wno-error=deprecated-declarations
+ -Wall -Wno-error=deprecated-declarations
libindicator_la_LIBADD = \
$(LIBINDICATOR_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96825f3..ecb53b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,7 +39,7 @@ test_loader_SOURCES = \
test-loader.c
test_loader_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
-DBUILD_DIR="\"$(builddir)\""
@@ -58,7 +58,7 @@ test_desktop_shortcuts_SOURCES = \
test-desktop-shortcuts.c
test_desktop_shortcuts_CFLAGS = \
- -Wall -Werror \
+ -Wall \
-DSRCDIR="\"$(srcdir)\"" \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
-DBUILD_DIR="\"$(abs_builddir)\""
@@ -92,7 +92,7 @@ libdummy_indicator_blank_la_SOURCES = \
dummy-indicator-blank.c
libdummy_indicator_blank_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_blank_la_LIBADD = \
@@ -112,7 +112,7 @@ libdummy_indicator_null_la_SOURCES = \
dummy-indicator-null.c
libdummy_indicator_null_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_null_la_LIBADD = \
@@ -132,7 +132,7 @@ libdummy_indicator_signaler_la_SOURCES = \
dummy-indicator-signaler.c
libdummy_indicator_signaler_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_signaler_la_LIBADD = \
@@ -152,7 +152,7 @@ libdummy_indicator_simple_la_SOURCES = \
dummy-indicator-simple.c
libdummy_indicator_simple_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_simple_la_LIBADD = \
@@ -173,7 +173,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
dummy-indicator-entry-func.h
libdummy_indicator_entry_func_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_entry_func_la_LIBADD = \
@@ -193,7 +193,7 @@ libdummy_indicator_visible_la_SOURCES = \
dummy-indicator-visible.c
libdummy_indicator_visible_la_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
libdummy_indicator_visible_la_LIBADD = \
@@ -215,7 +215,7 @@ service_shutdown_timeout_SOURCES = \
service-shutdown-timeout.c
service_shutdown_timeout_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_shutdown_timeout_LDADD = \
@@ -241,7 +241,7 @@ service_manager_no_connect_SOURCES = \
service-manager-no-connect.c
service_manager_no_connect_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_manager_no_connect_LDADD = \
@@ -273,7 +273,7 @@ service_manager_connect_SOURCES = \
service-manager-connect.c
service_manager_connect_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_manager_connect_LDADD = \
@@ -287,7 +287,7 @@ service_manager_connect_service_SOURCES = \
service-manager-connect-service.c
service_manager_connect_service_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_manager_connect_service_LDADD = \
@@ -320,7 +320,7 @@ service_version_manager_SOURCES = \
service-version-manager.c
service_version_manager_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_manager_LDADD = \
@@ -335,7 +335,7 @@ service_version_bad_service_SOURCES = \
service-version-bad-service.c
service_version_bad_service_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_bad_service_LDADD = \
@@ -350,7 +350,7 @@ service_version_good_service_SOURCES = \
service-version-good-service.c
service_version_good_service_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_good_service_LDADD = \
@@ -377,7 +377,7 @@ service_version_multiwatch_manager_SOURCES = \
service-version-multiwatch-manager.c
service_version_multiwatch_manager_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_multiwatch_manager_LDADD = \
@@ -392,7 +392,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
service-version-multiwatch-manager-impolite.c
service_version_multiwatch_manager_impolite_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_multiwatch_manager_impolite_LDADD = \
@@ -407,7 +407,7 @@ service_version_multiwatch_service_SOURCES = \
service-version-multiwatch-service.c
service_version_multiwatch_service_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_version_multiwatch_service_LDADD = \
@@ -433,7 +433,7 @@ service_manager_nostart_connect_SOURCES = \
service-manager-nostart-connect.c
service_manager_nostart_connect_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
service_manager_nostart_connect_LDADD = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8df5445..d487c59 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -13,7 +13,7 @@ indicator_loader_SOURCES = \
indicator-loader.c
indicator_loader_CFLAGS = \
- -Wall -Werror \
+ -Wall \
$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
-DBUILD_DIR="\"$(builddir)\""