From 2228bc7e103dc6cb740e25082f2fc0a002c37f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 May 2024 17:50:09 +0200 Subject: [PATCH] FreeBSD: Fix loading of window decoration module in twin for new styles. This relates to issue TDE/tde-packaging-gentoo#373. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6e966d18f421ef993425460f5a392f0af7096c6a) --- .../themes/tde-style-polyester/Makefile | 2 +- .../patch-bp000-fix-loading-in-twin.diff | 35 +++++++++++++++++++ .../themes/tde-style-polyester/pkg-plist | 4 +-- .../themes/twin-style-fahrenheit/Makefile | 2 +- .../patch-bp000-fix-loading-in-twin.diff | 34 ++++++++++++++++++ .../themes/twin-style-fahrenheit/pkg-plist | 4 +-- 6 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 freebsd/applications/themes/tde-style-polyester/files/patch-bp000-fix-loading-in-twin.diff create mode 100644 freebsd/applications/themes/twin-style-fahrenheit/files/patch-bp000-fix-loading-in-twin.diff diff --git a/freebsd/applications/themes/tde-style-polyester/Makefile b/freebsd/applications/themes/tde-style-polyester/Makefile index 2e98b4e5b..e99462eb1 100644 --- a/freebsd/applications/themes/tde-style-polyester/Makefile +++ b/freebsd/applications/themes/tde-style-polyester/Makefile @@ -11,7 +11,7 @@ PORTNAME= tde-style-polyester-trinity COMMENT= Polyester widget style and twin decoration for TDE TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-themes DIST_SUBDIR= TDE/applications/themes diff --git a/freebsd/applications/themes/tde-style-polyester/files/patch-bp000-fix-loading-in-twin.diff b/freebsd/applications/themes/tde-style-polyester/files/patch-bp000-fix-loading-in-twin.diff new file mode 100644 index 000000000..426a326c2 --- /dev/null +++ b/freebsd/applications/themes/tde-style-polyester/files/patch-bp000-fix-loading-in-twin.diff @@ -0,0 +1,35 @@ +commit 7c56e0db5cfa14b280ca25b455daae77e75eb953 +Author: Michele Calgaro +Date: Fri May 3 10:12:45 2024 +0900 + + Fix loading of window decoration module in twin + + Signed-off-by: Michele Calgaro + +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 diff --git a/freebsd/applications/themes/tde-style-polyester/pkg-plist b/freebsd/applications/themes/tde-style-polyester/pkg-plist index c1fc3f95b..103d1fdd0 100644 --- a/freebsd/applications/themes/tde-style-polyester/pkg-plist +++ b/freebsd/applications/themes/tde-style-polyester/pkg-plist @@ -2,8 +2,8 @@ lib/trinity/plugins/styles/polyester.la lib/trinity/plugins/styles/polyester.so lib/trinity/tdestyle_polyester_config.la lib/trinity/tdestyle_polyester_config.so -lib/trinity/twin_polyester.la -lib/trinity/twin_polyester.so +lib/trinity/twin3_polyester.la +lib/trinity/twin3_polyester.so lib/trinity/twin_polyester_config.la lib/trinity/twin_polyester_config.so share/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc diff --git a/freebsd/applications/themes/twin-style-fahrenheit/Makefile b/freebsd/applications/themes/twin-style-fahrenheit/Makefile index 5346daeda..c550e4027 100644 --- a/freebsd/applications/themes/twin-style-fahrenheit/Makefile +++ b/freebsd/applications/themes/twin-style-fahrenheit/Makefile @@ -11,7 +11,7 @@ PORTNAME= twin-style-fahrenheit-trinity COMMENT= TDE window decoration Fahrenheit TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-themes DIST_SUBDIR= TDE/applications/themes diff --git a/freebsd/applications/themes/twin-style-fahrenheit/files/patch-bp000-fix-loading-in-twin.diff b/freebsd/applications/themes/twin-style-fahrenheit/files/patch-bp000-fix-loading-in-twin.diff new file mode 100644 index 000000000..205aafd88 --- /dev/null +++ b/freebsd/applications/themes/twin-style-fahrenheit/files/patch-bp000-fix-loading-in-twin.diff @@ -0,0 +1,34 @@ +commit 50ad465a06aae81d96efca4ee9a7468b1f303c43 +Author: Michele Calgaro +Date: Fri May 3 10:15:38 2024 +0900 + + Fix loading of window decoration module in twin + + Signed-off-by: Michele Calgaro + +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 diff --git a/freebsd/applications/themes/twin-style-fahrenheit/pkg-plist b/freebsd/applications/themes/twin-style-fahrenheit/pkg-plist index 015bbfe61..ad48b81df 100644 --- a/freebsd/applications/themes/twin-style-fahrenheit/pkg-plist +++ b/freebsd/applications/themes/twin-style-fahrenheit/pkg-plist @@ -1,5 +1,5 @@ -lib/trinity/twin_fahrenheit.la -lib/trinity/twin_fahrenheit.so +lib/trinity/twin3_fahrenheit.la +lib/trinity/twin3_fahrenheit.so share/apps/twin/fahrenheit.desktop share/apps/twin/fahrenheit/close.png share/apps/twin/fahrenheit/help.png