diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/kde/modules/applications | 7 | ||||
-rw-r--r-- | source/kde/kde/modules/kdepim | 3 | ||||
-rwxr-xr-x | source/l/qt6/fetch_sources.sh | 2 | ||||
-rwxr-xr-x | source/l/qt6/qt6.SlackBuild | 14 | ||||
-rw-r--r-- | source/n/lynx/lynx.url | 2 | ||||
-rw-r--r-- | source/x/x11/configure/gccmakedep | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libX11 | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libXaw3d | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libXp | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libXt | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libxcb | 1 | ||||
-rw-r--r-- | source/x/x11/configure/libxshmfence | 1 | ||||
-rw-r--r-- | source/x/x11/configure/setxkbmap | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xdm | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xf86-video-geode | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xf86-video-glint | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xf86-video-intel | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xf86-video-nouveau | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xf86-video-s3 | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xfs | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xkbcomp | 1 | ||||
-rw-r--r-- | source/x/x11/configure/xorg-server | 1 |
22 files changed, 34 insertions, 11 deletions
diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications index a7483552f..99e1900e1 100644 --- a/source/kde/kde/modules/applications +++ b/source/kde/kde/modules/applications @@ -195,6 +195,7 @@ kdeconnect-kde # New in 20.12.0: markdownpart kpublictransport +kopeninghours kosmindoormap itinerary kontrast @@ -213,9 +214,6 @@ kdev-php kdev-python umbrello -# New in 21.12.0: -zanshin - # New in 22.04.0: falkon #kalendar @@ -230,6 +228,3 @@ keysmith kio-admin # Sorry, the mpv/libass deps are getting this one yeeted #tokodon - -# New in 23.08.0: -merkuro diff --git a/source/kde/kde/modules/kdepim b/source/kde/kde/modules/kdepim index 93b73c9f6..831d75c8d 100644 --- a/source/kde/kde/modules/kdepim +++ b/source/kde/kde/modules/kdepim @@ -35,7 +35,6 @@ incidenceeditor mailcommon kleopatra kpkpass -kopeninghours kitinerary kdepim-addons kdepim-runtime @@ -54,3 +53,5 @@ korganizer mbox-importer pim-data-exporter pim-sieve-editor +zanshin +merkuro diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index 7e098b08f..780905738 100755 --- a/source/l/qt6/fetch_sources.sh +++ b/source/l/qt6/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="6.6.2" +BRANCH="6.6.3" rm -f qt-everywhere-src-*.tar* diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index 761cdaf3e..f40431fc8 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) @@ -150,6 +150,12 @@ cat $CWD/patches/nodejs-allow-32bit.patch | patch -p1 --verbose || exit 1 # GCC13 requires this include: cat $CWD/patches/qt6-3d_gcc13.patch | patch -p0 --verbose || exit 1 +# Previously we didn't have a protobuf package in Slackware. +# Now that we do, it's apparently too new to use with Qt6, so let's just +# disable it to get the same features that we previously did. +# Patches would be accepted here. :-) +PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" + # The qtquick3dphysics only compiles on a limited set of architectures: case "${ARCH}" in i?86 | arm | s390) DO_PHYSX3D="OFF" ;; @@ -199,8 +205,12 @@ cmake -S $(pwd) -B build-${PKGNAM} \ -DFEATURE_webengine_system_ffmpeg="${SYSTEM_FFMPEG}" \ -DFEATURE_webengine_system_pulseaudio="${USE_PULSEAUDIO}" \ -DFEATURE_webengine_webrtc_pipewire=ON \ + $PROTOBUF \ -DQT_BUILD_EXAMPLES=OFF || exit 1 -cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1 +#cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1 +# Don't try again non-parallel... it just makes you wait a long time to see +# what the error was. +cmake --build build-${PKGNAM} --parallel $NINJAJOBS || exit 1 DESTDIR=$PKG cmake --install build-${PKGNAM} || exit 1 # Strip binaries: diff --git a/source/n/lynx/lynx.url b/source/n/lynx/lynx.url index 082c70711..02a1a5331 100644 --- a/source/n/lynx/lynx.url +++ b/source/n/lynx/lynx.url @@ -1 +1 @@ -ftp://ftp.invisible-island.net/lynx/tarballs/ +https://invisible-island.net/archives/lynx/tarballs/ diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep index 181ae81e9..741f8ea6e 100644 --- a/source/x/x11/configure/gccmakedep +++ b/source/x/x11/configure/gccmakedep @@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux # # --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11 index 2f003db4a..625ca2e15 100644 --- a/source/x/x11/configure/libX11 +++ b/source/x/x11/configure/libX11 @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --disable-static \ --disable-thread-safety-constructor \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d index 0d802fa3b..814adf0e7 100644 --- a/source/x/x11/configure/libXaw3d +++ b/source/x/x11/configure/libXaw3d @@ -13,4 +13,5 @@ CXXFLAGS=$SLKCFLAGS \ --enable-gray-stipples \ --enable-arrow-scrollbars \ --enable-internationalization \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp index 181ae81e9..741f8ea6e 100644 --- a/source/x/x11/configure/libXp +++ b/source/x/x11/configure/libXp @@ -8,6 +8,7 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux # # --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} diff --git a/source/x/x11/configure/libXt b/source/x/x11/configure/libXt index 3c832abd2..758e719ca 100644 --- a/source/x/x11/configure/libXt +++ b/source/x/x11/configure/libXt @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --disable-static \ --with-appdefaultdir=/etc/X11/app-defaults \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libxcb b/source/x/x11/configure/libxcb index 0c8a4a8c8..c3cc35473 100644 --- a/source/x/x11/configure/libxcb +++ b/source/x/x11/configure/libxcb @@ -11,4 +11,5 @@ CXXFLAGS=$SLKCFLAGS \ --disable-static \ --enable-xinput \ --enable-xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/libxshmfence b/source/x/x11/configure/libxshmfence index ec0521d86..7b3b7025d 100644 --- a/source/x/x11/configure/libxshmfence +++ b/source/x/x11/configure/libxshmfence @@ -12,4 +12,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/setxkbmap b/source/x/x11/configure/setxkbmap index 91f8353fb..0a6de166f 100644 --- a/source/x/x11/configure/setxkbmap +++ b/source/x/x11/configure/setxkbmap @@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --with-xkb-config-root=/etc/X11/xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xdm b/source/x/x11/configure/xdm index 1c7dc7ccd..5bc76962b 100644 --- a/source/x/x11/configure/xdm +++ b/source/x/x11/configure/xdm @@ -16,4 +16,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ $XDM_PAM_OPTION \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-geode b/source/x/x11/configure/xf86-video-geode index a6eab1095..128f66476 100644 --- a/source/x/x11/configure/xf86-video-geode +++ b/source/x/x11/configure/xf86-video-geode @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-glint b/source/x/x11/configure/xf86-video-glint index 291eb9b94..39eaf927c 100644 --- a/source/x/x11/configure/xf86-video-glint +++ b/source/x/x11/configure/xf86-video-glint @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel index 88581a1e7..faf752eba 100644 --- a/source/x/x11/configure/xf86-video-intel +++ b/source/x/x11/configure/xf86-video-intel @@ -18,4 +18,5 @@ CXXFLAGS="$ALTCFLAGS" \ --enable-kms-only \ --enable-uxa \ --with-default-dri=3 \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau index 7352247c7..a9dcd059b 100644 --- a/source/x/x11/configure/xf86-video-nouveau +++ b/source/x/x11/configure/xf86-video-nouveau @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-s3 b/source/x/x11/configure/xf86-video-s3 index 291eb9b94..39eaf927c 100644 --- a/source/x/x11/configure/xf86-video-s3 +++ b/source/x/x11/configure/xf86-video-s3 @@ -10,4 +10,5 @@ CXXFLAGS=$SLKCFLAGS \ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \ --with-udev-rules-dir=/lib/udev/rules.d \ --disable-static \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xfs b/source/x/x11/configure/xfs index 38f50c9a8..570dca393 100644 --- a/source/x/x11/configure/xfs +++ b/source/x/x11/configure/xfs @@ -9,4 +9,5 @@ CXXFLAGS=$SLKCFLAGS \ --mandir=/usr/man \ --disable-static \ --disable-devel-docs \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xkbcomp b/source/x/x11/configure/xkbcomp index 91f8353fb..0a6de166f 100644 --- a/source/x/x11/configure/xkbcomp +++ b/source/x/x11/configure/xkbcomp @@ -8,4 +8,5 @@ CXXFLAGS=$SLKCFLAGS \ --infodir=/usr/info \ --mandir=/usr/man \ --with-xkb-config-root=/etc/X11/xkb \ + --enable-year2038 \ --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index e3426aa21..6a536c0d5 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -69,6 +69,7 @@ CFLAGS="$SLKCFLAGS" \ --with-xkb-output=/var/lib/xkb \ --enable-config-udev \ --disable-config-hal \ + --enable-year2038 \ $BUILD_SERVERS \ $ROOTLESS_OPTIONS \ --build=$ARCH-slackware-linux |