commit: 0bb5bad3e9ccd91a709c64134523a219faaf2dbd
parent 1edf978bf78353eda719fe75d5c1ebb20ca856d2
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Wed, 31 Jan 2024 17:18:42 +0100
games-arcade/kobodeluxe: fix sfx installation
Diffstat:
4 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/games-arcade/kobodeluxe/files/0001-CMake-Fix-desktop-icon-installation.patch b/games-arcade/kobodeluxe/files/0001-CMake-Fix-desktop-icon-installation.patch
@@ -0,0 +1,29 @@
+From f45b765c9f005c7f8b5327a1cbce3b67f3a9b89c Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Wed, 31 Jan 2024 16:58:38 +0100
+Subject: [PATCH 1/2] CMake: Fix desktop icon installation
+
+Also .desktop file refers to kobodl as icon-name so should be left unchanged
+---
+ CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29fa1b7..01355d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,9 +87,8 @@ install(FILES ${doc_files}
+ # Desktop entry
+ if(NOT WIN32)
+ set(KOBO_DE_FILE "net.olofson.${KOBO_PACKAGE_NAME}.desktop")
+- install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/kobodeluxe.png"
+- DESTINATION "share/pixmaps"
+- RENAME "${KOBO_PACKAGE_NAME}.png")
++ install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/kobodl.png"
++ DESTINATION "share/pixmaps")
+ install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/${KOBO_DE_FILE}"
+ DESTINATION "share/applications")
+ endif(NOT WIN32)
+--
+2.43.0
+
diff --git a/games-arcade/kobodeluxe/files/0002-CMake-Fix-sfx-installation.patch b/games-arcade/kobodeluxe/files/0002-CMake-Fix-sfx-installation.patch
@@ -0,0 +1,27 @@
+From 42f117811cfa8c5c02fc83b4faef57b6857e3b5e Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Wed, 31 Jan 2024 17:16:15 +0100
+Subject: [PATCH 2/2] CMake: Fix sfx installation
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01355d8..ac291ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,8 +73,8 @@ install(DIRECTORY data/gfx
+ install(DIRECTORY data/sfx
+ DESTINATION "${KOBO_SHARE_DIR}"
+ FILES_MATCHING
+- PATTERN "*.a2s"
+- PATTERN "*.theme")
++ PATTERN "*.h"
++ PATTERN "*.agw")
+
+ # Documentation
+ file(GLOB doc_files
+--
+2.43.0
+
diff --git a/games-arcade/kobodeluxe/files/CMake-Fix-desktop-icon-installation.patch b/games-arcade/kobodeluxe/files/CMake-Fix-desktop-icon-installation.patch
@@ -1,29 +0,0 @@
-From f45b765c9f005c7f8b5327a1cbce3b67f3a9b89c Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Wed, 31 Jan 2024 16:58:38 +0100
-Subject: [PATCH] CMake: Fix desktop icon installation
-
-Also .desktop file refers to kobodl as icon-name so should be left unchanged
----
- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29fa1b7..01355d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,9 +87,8 @@ install(FILES ${doc_files}
- # Desktop entry
- if(NOT WIN32)
- set(KOBO_DE_FILE "net.olofson.${KOBO_PACKAGE_NAME}.desktop")
-- install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/kobodeluxe.png"
-- DESTINATION "share/pixmaps"
-- RENAME "${KOBO_PACKAGE_NAME}.png")
-+ install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/kobodl.png"
-+ DESTINATION "share/pixmaps")
- install(FILES "${KOBODELUXE_SOURCE_DIR}/icons/${KOBO_DE_FILE}"
- DESTINATION "share/applications")
- endif(NOT WIN32)
---
-2.43.0
-
diff --git a/games-arcade/kobodeluxe/kobodeluxe-9999.ebuild b/games-arcade/kobodeluxe/kobodeluxe-9999.ebuild
@@ -18,5 +18,6 @@ DEPEND="${RDEPEND}"
# https://github.com/olofson/kobodeluxe/pull/8
PATCHES=(
- "${FILESDIR}/CMake-Fix-desktop-icon-installation.patch"
+ "${FILESDIR}/0001-CMake-Fix-desktop-icon-installation.patch"
+ "${FILESDIR}/0002-CMake-Fix-sfx-installation.patch"
)
