diff options
Diffstat (limited to 'arch/tde-extra/tde-twin-style-fahrenheit')
| -rw-r--r-- | arch/tde-extra/tde-twin-style-fahrenheit/PKGBUILD | 20 | ||||
| -rw-r--r-- | arch/tde-extra/tde-twin-style-fahrenheit/bp000-fix-loading-in-twin.diff | 34 |
2 files changed, 48 insertions, 6 deletions
diff --git a/arch/tde-extra/tde-twin-style-fahrenheit/PKGBUILD b/arch/tde-extra/tde-twin-style-fahrenheit/PKGBUILD index f8ed275d0..ad7249db7 100644 --- a/arch/tde-extra/tde-twin-style-fahrenheit/PKGBUILD +++ b/arch/tde-extra/tde-twin-style-fahrenheit/PKGBUILD @@ -7,7 +7,7 @@ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" pkgver=14.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Port of the KDE 3.2's version of Fahrenheit window decoration" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -26,16 +26,24 @@ replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('05885e914abe26e077d5ad04f54fe2d7') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-fix-loading-in-twin.diff') +md5sums=('05885e914abe26e077d5ad04f54fe2d7' + 'c7bf7cec191c94805220a4624c4288ab') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${_mod}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-fix-loading-in-twin.diff +} + build() { msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p "$srcdir/build" - cd "$srcdir/build" + mkdir -p "$srcdir/build-$CARCH" + cd "$srcdir/build-$CARCH" export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} @@ -54,6 +62,6 @@ build() { package() { msg "Packaging - ${pkgname}-${pkgver}" - cd "$srcdir/build" + cd "$srcdir/build-$CARCH" DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-extra/tde-twin-style-fahrenheit/bp000-fix-loading-in-twin.diff b/arch/tde-extra/tde-twin-style-fahrenheit/bp000-fix-loading-in-twin.diff new file mode 100644 index 000000000..205aafd88 --- /dev/null +++ b/arch/tde-extra/tde-twin-style-fahrenheit/bp000-fix-loading-in-twin.diff @@ -0,0 +1,34 @@ +commit 50ad465a06aae81d96efca4ee9a7468b1f303c43 +Author: Michele Calgaro <michele.calgaro@yahoo.it> +Date: Fri May 3 10:15:38 2024 +0900 + + Fix loading of window decoration module in twin + + Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> + +diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt +index 7f35eec..494ded2 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -17,9 +17,9 @@ link_directories( + add_subdirectory( pics ) + + +-##### twin_fahrenheit (kpart) ++##### twin3_fahrenheit (kpart) + +-tde_add_kpart( twin_fahrenheit AUTOMOC ++tde_add_kpart( twin3_fahrenheit AUTOMOC + + SOURCES + fahrenheitclient.cpp +diff --git a/client/fahrenheit.desktop b/client/fahrenheit.desktop +index 32a887b..29f78a4 100644 +--- a/client/fahrenheit.desktop ++++ b/client/fahrenheit.desktop +@@ -1,4 +1,4 @@ + [Desktop Entry] + Encoding=UTF-8 + Name=Fahrenheit +-X-TDE-Library=twin_fahrenheit ++X-TDE-Library=twin3_fahrenheit |