diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2024-05-06 17:42:01 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2024-05-07 09:52:25 +0200 |
| commit | eacb0eb5ddd024b622fee53d14d4ceedda001de2 (patch) | |
| tree | 129d5f90fb9cc8e52fa59b625584f59a2d63a456 /arch/tde-extra/tde-style-polyester | |
| parent | 89b0dd94ad61d085f2a0dfb805d5dbaa8f17976e (diff) | |
| download | tde-packaging-eacb0eb5ddd024b622fee53d14d4ceedda001de2.tar.gz tde-packaging-eacb0eb5ddd024b622fee53d14d4ceedda001de2.zip | |
ArchLinux: Fix loading of window decoration module in twin for new styles.
This relates to issue TDE/tde-packaging-gentoo#373.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f4cf8eb910a4f05fd94ae14fdd42ed6b14195135)
Diffstat (limited to 'arch/tde-extra/tde-style-polyester')
| -rw-r--r-- | arch/tde-extra/tde-style-polyester/PKGBUILD | 20 | ||||
| -rw-r--r-- | arch/tde-extra/tde-style-polyester/bp000-fix-loading-in-twin.diff | 35 |
2 files changed, 49 insertions, 6 deletions
diff --git a/arch/tde-extra/tde-style-polyester/PKGBUILD b/arch/tde-extra/tde-style-polyester/PKGBUILD index 64bd26c44..c0ecc334c 100644 --- a/arch/tde-extra/tde-style-polyester/PKGBUILD +++ b/arch/tde-extra/tde-style-polyester/PKGBUILD @@ -7,7 +7,7 @@ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" pkgver=14.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Polyester widget style and twin decoration for TDE" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -27,16 +27,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=('c923dc99a364fd0acc47b3b0e2152204') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-fix-loading-in-twin.diff') +md5sums=('c923dc99a364fd0acc47b3b0e2152204' + 'af3f9f9291106443304f5e8844a64c56') [ -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} @@ -55,6 +63,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-style-polyester/bp000-fix-loading-in-twin.diff b/arch/tde-extra/tde-style-polyester/bp000-fix-loading-in-twin.diff new file mode 100644 index 000000000..426a326c2 --- /dev/null +++ b/arch/tde-extra/tde-style-polyester/bp000-fix-loading-in-twin.diff @@ -0,0 +1,35 @@ +commit 7c56e0db5cfa14b280ca25b455daae77e75eb953 +Author: Michele Calgaro <michele.calgaro@yahoo.it> +Date: Fri May 3 10:12:45 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 7e9d720..e505b79 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -63,9 +63,9 @@ add_custom_target( buttons-embed-images + ) + + +-### twin_polyester (kpart) ##################################################### ++### twin3_polyester (kpart) ##################################################### + +-tde_add_kpart( twin_polyester AUTOMOC ++tde_add_kpart( twin3_polyester AUTOMOC + + SOURCES + polyester.cpp +diff --git a/client/polyester.desktop b/client/polyester.desktop +index 52e7c93..30f8b1d 100755 +--- a/client/polyester.desktop ++++ b/client/polyester.desktop +@@ -2,4 +2,4 @@ + [Desktop Entry] + Encoding=UTF-8 + Name=Polyester +-X-TDE-Library=twin_polyester +\ No newline at end of file ++X-TDE-Library=twin3_polyester |