summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-07-27 21:01:22 +0000
committer Eric Hameleers <alien@slackware.com>2018-07-28 09:00:34 +0200
commite100944d49d766848de3d8e38a9d91b9edbe04a0 (patch)
tree542b7f010fb6548c8a5a68956dc60d62b15c4c2e /extra
parent7dba81f6b7375d01bcdd27fe402481ef14630001 (diff)
downloadcurrent-e100944d49d766848de3d8e38a9d91b9edbe04a0.tar.gz
current-e100944d49d766848de3d8e38a9d91b9edbe04a0.tar.xz
Fri Jul 27 21:01:22 UTC 201820180727210122
Hey folks, my first order of business here needs to be a huge thank you to everyone who has donated at https://paypal.me/volkerdi to help keep this project going. As most of you are already aware by now, the financal situation here at Slackware HQ has not been great for many years, including not getting any pay for the last two years and forcing me (and my family) to live very frugally while I continued to work on the project hoping I'd figure out a way to actually monitize it by the time that Slackware 15.0 is ready for release. I'm not trying to cast any blame regarding the situation. Really, I can only blame myself for not trying to build my own ship years ago when things began to not really work out. I'm still looking into sustainable funding options such as Patreon or Liberapay (or perhaps both), and I'm open to other ideas. I'm no longer in immediate danger of going broke, and I'm no longer entertaining the notion of joining my friends at the local potato chip factory in order to pay my bills. :) My family is grateful and humbled by the support we've received. Hope we'll be able to keep this project going for a long time. Also, I realize that the website lacks updates and needs attention and I will need to find some time to devote to that. I've never been much of a website designer, and the slackware.com site is basically left over from work done by former Walnut Creek / BSDi employees. I've never seen able to make much sense of the SQL backend. The interface to edit and post articles is clunky (and I'm not sure the PHP for that even works any more). When I've posted articles in recent years, I've done so by editing the main page already processed from PHP into HTML, which is pretty darn messy as I'm sure you can imagine. I tend to prioritize the distribution itself over other demands on my time - that's clearly a lot to do with how things ended up the way they did. So, I guess that's the report for now. Lots more work to do and not enough time to do it in... that part I don't see changing moving forward. :) Thanks very much again. I'll do my best to keep you all posted. - Pat a/file-5.34-x86_64-1.txz: Upgraded. a/kernel-firmware-20180727_b01151b-noarch-1.txz: Upgraded. a/kernel-generic-4.14.58-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.58-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.58-x86_64-1.txz: Upgraded. d/gcc-8.2.0-x86_64-1.txz: Upgraded. d/gcc-brig-8.2.0-x86_64-1.txz: Upgraded. d/gcc-g++-8.2.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-8.2.0-x86_64-1.txz: Upgraded. d/gcc-gnat-8.2.0-x86_64-1.txz: Upgraded. d/gcc-go-8.2.0-x86_64-1.txz: Upgraded. d/gcc-objc-8.2.0-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.58-x86-1.txz: Upgraded. d/libtool-2.4.6-x86_64-9.txz: Rebuilt. Recompiled to update embedded GCC version number. k/kernel-source-4.14.58-noarch-1.txz: Upgraded. CRASH_DUMP n -> y KEXEC n -> y +KEXEC_JUMP y +PROC_VMCORE y l/babl-0.1.54-x86_64-1.txz: Upgraded. l/gegl-0.4.6-x86_64-1.txz: Upgraded. l/libart_lgpl-2.3.21-x86_64-2.txz: Removed. This actually hasn't been needed by any Slackware package since koffice in KDE3, and this particular version won't work with the Trinity Desktop Environment, which is essentially a fork of KDE 3.5 updated to compile and run with modern libraries and development tools. I can't see much point in keeping it around. Thanks to _gin. n/NetworkManager-1.12.2-x86_64-1.txz: Upgraded. n/dhcpcd-7.0.7-x86_64-1.txz: Upgraded. x/libinput-1.11.3-x86_64-1.txz: Upgraded. extra/tigervnc/tigervnc-1.9.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'extra')
-rw-r--r--extra/source/tigervnc/patches/tigervnc-support-xorg120.patch58
-rw-r--r--extra/source/tigervnc/slack-desc2
-rwxr-xr-xextra/source/tigervnc/tigervnc.SlackBuild42
3 files changed, 21 insertions, 81 deletions
diff --git a/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch b/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch
deleted file mode 100644
index dcb50db9a..000000000
--- a/extra/source/tigervnc/patches/tigervnc-support-xorg120.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 9d1c0eb..79ff79a 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -52,8 +52,10 @@
- #define XORG 118
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
- #define XORG 119
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
-+#define XORG 120
- #else
--#error "X.Org newer than 1.19 is not supported"
-+#error "X.Org newer than 1.20 is not supported"
- #endif
-
- #endif
-diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
-index 93d8af4..1517809 100644
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth)
-
- static void vfbFreeFramebufferMemory(vfbFramebufferInfoPtr pfb);
-
-+#if XORG < 120
- #ifdef DPMSExtension
- /* Why support DPMS? Because stupid modern desktop environments
- such as Unity 2D on Ubuntu 11.10 crashes if DPMS is not
-@@ -219,6 +220,7 @@ Bool DPMSSupported(void)
- return FALSE;
- }
- #endif
-+#endif
-
- #if XORG < 111
- void ddxGiveUp()
-@@ -1491,6 +1491,12 @@ vfbCloseScreen(ScreenPtr pScreen)
- #endif
- }
-
-+#if XORG >= 120
-+static void vncDPMS(ScreenPtr pScreen, int level)
-+{
-+}
-+#endif
-+
- static Bool
- #if XORG < 113
- vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-@@ -1661,6 +1667,9 @@ vfbScreenInit(ScreenPtr pScreen, int arg
- if (!ret) return FALSE;
- #endif
-
-+#if XORG >= 120
-+ pScreen->DPMS = vncDPMS;
-+#endif
-
- return TRUE;
diff --git a/extra/source/tigervnc/slack-desc b/extra/source/tigervnc/slack-desc
index 088392abe..fc0692ccf 100644
--- a/extra/source/tigervnc/slack-desc
+++ b/extra/source/tigervnc/slack-desc
@@ -14,6 +14,6 @@ tigervnc: and from a wide variety of machine architectures.
tigervnc: TigerVNC is a suite of VNC servers and clients that have a focus on
tigervnc: performance and remote display functionality.
tigervnc:
+tigervnc: Homepage: http://tigervnc.org
tigervnc:
-tigervnc: tigervnc home: http://tigervnc.org/
tigervnc:
diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild
index ea80ca233..b69490f45 100755
--- a/extra/source/tigervnc/tigervnc.SlackBuild
+++ b/extra/source/tigervnc/tigervnc.SlackBuild
@@ -72,13 +72,14 @@
# * Removed bundled FLTK and libjpeg-turbo builds.
# * Reset build to -1 for inclusion in Slackware's /extra.
# 1.6.0-1: 22/feb/2016 by Patrick Volkerding <volkerdi@slackware.com>
+# 1.9.0-1: 26/jul/2018 by Patrick Volkerding <volkerdi@slackware.com>
#
# -----------------------------------------------------------------------------
PKGNAM=tigervnc
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.9.0}
PVER=$(echo $VERSION | cut -f 1,2 -d . | tr -d .)
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j7 "}
TAG=${TAG:-}
@@ -186,8 +187,8 @@ cd $PKGNAM-$VERSION || exit 1
# HACK! Force protocol 3.3 for UVNCSC
patch -p1 < $CWD/patches/force_protocol_3.3_for_UVNCSC.patch
-# Patch to support x.org 1.20
-cat $CWD/patches/tigervnc-support-xorg120.patch | patch -p1 --verbose || exit 1
+## Patch to support x.org 1.20 (already included in tigervnc-1.9.0):
+#cat $CWD/patches/tigervnc-support-xorg120.patch | patch -p1 --verbose || exit 1
# Explicitly link against libpng to prevent linking errors:
cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1
@@ -205,24 +206,21 @@ sed -e 's,set(MAN_DIR "${DATA_DIR}/man"),set(MAN_DIR "${MAN_INSTALL_DIR}"),' \
-e 's,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/,' \
-i CMakeLists.txt
-mkdir -p build
-cd build
- echo -e "\n*** Building vnc client ***\n"
- cmake \
- -G "Unix Makefiles" \
- -Wno-dev \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DENABLE_PAM:BOOL=OFF \
- -DBUILD_JAVA:BOOL=${CMAKE_JAVA} \
- ..
- make V=1 $NUMJOBS || make || exit 1
- make DESTDIR=$PKG install || exit 1
-cd -
+echo -e "\n*** Building vnc client ***\n"
+cmake \
+ -G "Unix Makefiles" \
+ -Wno-dev \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DENABLE_PAM:BOOL=OFF \
+ -DBUILD_JAVA:BOOL=${CMAKE_JAVA} \
+ .
+make V=1 $NUMJOBS || make || exit 1
+make DESTDIR=$PKG install || exit 1
# Do we have a patch for X.Org which tigervnc does not have?
if [ ! -f unix/xserver${MAXPATCHVER}.patch -a -f $CWD/patches/xserver${MAXPATCHVER}.patch ]