mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
network/synergy: Updated for version 1.8.8
Signed-off-by: Christoph Willing <chris.willing@linux.com>
This commit is contained in:
Christoph Willing
Willy Sudiarto Raharjo
parent
7850eb7d76
commit
6cae326798
3 changed files with 59 additions and 15 deletions
41
network/synergy/020_toolchain_commands.diff
Normal file
41
network/synergy/020_toolchain_commands.diff
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
--- ext/toolchain/commands1.py.orig 2017-03-04 00:05:27.000000000 +1000
|
||||
+++ ext/toolchain/commands1.py 2020-02-12 09:12:23.304443034 +1000
|
||||
@@ -967,16 +967,17 @@
|
||||
if sys.version_info < (2, 4):
|
||||
raise Exception("Python 2.4 or greater required.")
|
||||
|
||||
- p = subprocess.Popen(
|
||||
- ["git", "log", "--pretty=format:%h", "-n", "1"],
|
||||
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
-
|
||||
- stdout, stderr = p.communicate()
|
||||
-
|
||||
- if p.returncode != 0:
|
||||
- raise Exception('Could not get revision, git error: ' + str(p.returncode))
|
||||
-
|
||||
- return stdout.strip()
|
||||
+# p = subprocess.Popen(
|
||||
+# ["git", "log", "--pretty=format:%h", "-n", "1"],
|
||||
+# stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
+#
|
||||
+# stdout, stderr = p.communicate()
|
||||
+#
|
||||
+# if p.returncode != 0:
|
||||
+# raise Exception('Could not get revision, git error: ' + str(p.returncode))
|
||||
+#
|
||||
+# return stdout.strip()
|
||||
+ return "1.8.8"
|
||||
|
||||
def getGitBranchName(self):
|
||||
if sys.version_info < (2, 4):
|
||||
--- src/gui/src/AboutDialog.cpp.orig 2017-03-04 00:05:27.000000000 +1000
|
||||
+++ src/gui/src/AboutDialog.cpp 2020-02-12 09:47:52.648113058 +1000
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
m_versionChecker.setApp(synergyApp);
|
||||
QString version = m_versionChecker.getVersion();
|
||||
- version = version + '-' + VERSION_STAGE + '-' + VERSION_REVISION;
|
||||
+ version = version + '-' + VERSION_STAGE;
|
||||
m_pLabelSynergyVersion->setText(version);
|
||||
|
||||
QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified();
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
# Slackware build script for "synergy".
|
||||
|
||||
# Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de>
|
||||
# Copyright 2020 Christoph Willing Brisbane, Australia
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -25,7 +26,8 @@
|
|||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=synergy
|
||||
VERSION=${VERSION:-1.7.6}
|
||||
SRCNAM=synergy-core
|
||||
VERSION=${VERSION:-1.8.8}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
|
@ -61,9 +63,12 @@ set -e
|
|||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
rm -rf $PRGNAM-$VERSION-stable
|
||||
tar xvf $CWD/v$VERSION-stable.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-stable.tar.gz
|
||||
cd $PRGNAM-$VERSION-stable
|
||||
rm -rf $SRCNAM-$VERSION-stable
|
||||
tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz
|
||||
cd $SRCNAM-$VERSION-stable
|
||||
patch -p0 < $CWD/010_include_dns_sd.diff
|
||||
patch -p0 < $CWD/020_toolchain_commands.diff
|
||||
|
||||
chown -R root:root .
|
||||
find -L . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||
|
|
@ -71,8 +76,6 @@ 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 {} \;
|
||||
|
||||
# Thanks Christoph Willing
|
||||
patch -p0 < $CWD/010_include_dns_sd.diff
|
||||
|
||||
sh hm.sh configure --generator=1 --release
|
||||
CXXFLAGS="$SLKCFLAGS" sh hm.sh build
|
||||
|
|
@ -82,27 +85,27 @@ mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 \
|
|||
$PKG/usr/share/icons/hicolor/256x256 $PKG/usr/share/applications
|
||||
|
||||
for file in synergy synergyc synergyd synergys syntool usynergy ; do
|
||||
install -s -m 0755 $TMP/$PRGNAM-$VERSION-stable/bin/$file $PKG/usr/bin
|
||||
install -s -m 0755 $TMP/$SRCNAM-$VERSION-stable/bin/$file $PKG/usr/bin
|
||||
done
|
||||
|
||||
for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do
|
||||
install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
done
|
||||
|
||||
for file in COMPILE ChangeLog INSTALL LICENSE README ; do
|
||||
install -m 0644 $TMP/$PRGNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
install -m 0644 $TMP/$SRCNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
done
|
||||
|
||||
for file in synergyc.man synergys.man ; do
|
||||
install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
|
||||
install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1
|
||||
done
|
||||
find $PKG/usr/man/man1 -type f -name "*.man" -exec rename '.man' '.1' {} \;
|
||||
find $PKG/usr/man/man1 -type f -name "*.?" -exec gzip -9f {} \;
|
||||
|
||||
install -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.ico \
|
||||
install -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.ico \
|
||||
$PKG/usr/share/icons/hicolor/256x256
|
||||
|
||||
install -D -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.desktop \
|
||||
install -D -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.desktop \
|
||||
$PKG/usr/share/applications
|
||||
|
||||
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="synergy"
|
||||
VERSION="1.7.6"
|
||||
VERSION="1.8.8"
|
||||
HOMEPAGE="http://synergy-project.org/"
|
||||
DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/network/synergy/v1.7.6-stable.tar.gz"
|
||||
MD5SUM="a324798a47445de739a7ed4baf12638f"
|
||||
DOWNLOAD="https://github.com/symless/synergy-core/archive/v1.8.8-stable/synergy-core-1.8.8-stable.tar.gz"
|
||||
MD5SUM="ad0514cc4dbfbc90aabc75c7ff17f0f3"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="avahi"
|
||||
|
|
|
|||
Loading…
Reference in a new issue