diff options
| author | LuoYi | 2022-07-14 21:42:07 +0800 |
|---|---|---|
| committer | LuoYi | 2022-07-14 21:42:07 +0800 |
| commit | fbd3c8a5fe1351dfe5ee47ce09a0ec8a89a2a645 (patch) | |
| tree | 1ef1000f239b30b3d656cee018a78110269efb0d | |
| parent | a3569e6f33dfa81dd703fe68b3156f869e218436 (diff) | |
| download | aur-fbd3c8a5fe1351dfe5ee47ce09a0ec8a89a2a645.tar.gz | |
Rename icons to avoid confict with extension-manager
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | rename_icons.diff | 43 |
4 files changed, 53 insertions, 2 deletions
@@ -20,7 +20,9 @@ pkgbase = blackbox-terminal-git conflicts = blackbox-terminal source = blackbox::git+https://gitlab.gnome.org/raggesilver/blackbox.git source = launch_fix.diff + source = rename_icons.diff b2sums = SKIP b2sums = dcb2b68305fef327a5d718840f9b934cddb45ef2f2967f845734253eaca11d47c0b1016d2b8332fc05f162392f6021b4f5937758e9343bf81569de15d14b8315 + b2sums = 22e4a1f53a1a9411104bcea87dd51c86479351d0ee98b4dc4a0b4a92276a4f3f2945c12e3e7aa6a5137ebcb7a67c959eca11f4a3babb3cbed0c0231e11afaecc pkgname = blackbox-terminal-git diff --git a/.gitignore b/.gitignore index 697ca1111618..8a05c3d4ec6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ * !PKGBUILD !launch_fix.diff +!rename_icons.diff !.SRCINFO !.gitignore
\ No newline at end of file @@ -13,9 +13,10 @@ makedepends=('git' 'meson' 'vala' 'gi-docgen') checkdepends=('appstream-glib') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") -source=(blackbox::git+$url.git launch_fix.diff) +source=(blackbox::git+$url.git launch_fix.diff rename_icons.diff) b2sums=('SKIP' - 'dcb2b68305fef327a5d718840f9b934cddb45ef2f2967f845734253eaca11d47c0b1016d2b8332fc05f162392f6021b4f5937758e9343bf81569de15d14b8315') + 'dcb2b68305fef327a5d718840f9b934cddb45ef2f2967f845734253eaca11d47c0b1016d2b8332fc05f162392f6021b4f5937758e9343bf81569de15d14b8315' + '22e4a1f53a1a9411104bcea87dd51c86479351d0ee98b4dc4a0b4a92276a4f3f2945c12e3e7aa6a5137ebcb7a67c959eca11f4a3babb3cbed0c0231e11afaecc') pkgver() { cd blackbox @@ -28,6 +29,10 @@ pkgver() { prepare() { cd blackbox + # Rename icons + # Avoid install failed when extension-manager is installed + patch -p1 < ../rename_icons.diff + # Fix launch issue of blackbox # see: https://github.com/mitchmindtree/blackbox.nix/issues/2 patch -p1 < ../launch_fix.diff diff --git a/rename_icons.diff b/rename_icons.diff new file mode 100644 index 000000000000..09d601a53408 --- /dev/null +++ b/rename_icons.diff @@ -0,0 +1,43 @@ +diff --git a/data/icons/hicolor/scalable/actions/external-link-symbolic.svg b/data/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-external-link-symbolic.svg +similarity index 100% +rename from data/icons/hicolor/scalable/actions/external-link-symbolic.svg +rename to data/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-external-link-symbolic.svg +diff --git a/data/icons/hicolor/scalable/actions/settings-symbolic.svg b/data/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-settings-symbolic.svg +similarity index 100% +rename from data/icons/hicolor/scalable/actions/settings-symbolic.svg +rename to data/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-settings-symbolic.svg +diff --git a/data/icons/meson.build b/data/icons/meson.build +index 6596c86..81536ea 100644 +--- a/data/icons/meson.build ++++ b/data/icons/meson.build +@@ -8,6 +8,6 @@ install_data(['hicolor/scalable/apps/com.raggesilver.BlackBox.svg'], + + install_data(['hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg', + 'hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg', +- 'hicolor/scalable/actions/settings-symbolic.svg', +- 'hicolor/scalable/actions/external-link-symbolic.svg', ++ 'hicolor/scalable/actions/com.raggesilver.BlackBox-settings-symbolic.svg', ++ 'hicolor/scalable/actions/com.raggesilver.BlackBox-external-link-symbolic.svg', + ], install_dir: join_paths(icondir, 'scalable/actions')) +diff --git a/src/gtk/preferences-window.ui b/src/gtk/preferences-window.ui +index adbd5dc..6f01543 100644 +--- a/src/gtk/preferences-window.ui ++++ b/src/gtk/preferences-window.ui +@@ -7,7 +7,7 @@ + <child> + <object class="AdwPreferencesPage"> + <property name="title" translatable="yes">General</property> +- <property name="icon-name">settings-symbolic</property> ++ <property name="icon-name">com.raggesilver.BlackBox-settings-symbolic</property> + <child> + <object class="AdwPreferencesGroup"> + <property name="title" translatable="yes">Window</property> +@@ -346,7 +346,7 @@ + </child> + <child> + <object class="GtkButton"> +- <property name="icon-name">external-link-symbolic</property> ++ <property name="icon-name">com.raggesilver.BlackBox-external-link-symbolic</property> + <property name="tooltip-text" translatable="yes">Get more themes online</property> + <signal name="clicked" handler="on_get_more_themes_online" swapped="no" /> + <style /> |