aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2023-08-15 00:11:31 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2023-08-15 00:26:10 +0200
commitd55d2a971b995ee2b653ddd513c610d159998992 (patch)
tree846024c909d77dcea994b448c06b496e130e816d
parent2d4ee4677e345d1deb3fe80a205ee0346b2f0826 (diff)
downloadguix-d55d2a971b995ee2b653ddd513c610d159998992.tar
guix-d55d2a971b995ee2b653ddd513c610d159998992.tar.gz
gnu: fbreader: Fix icon.
* gnu/packages/patches/fbreader-fix-icon.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ebook.scm (fbreader)[source]<#:patches>: Add it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/ebook.scm3
-rw-r--r--gnu/packages/patches/fbreader-fix-icon.patch29
3 files changed, 32 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 4ce4775b82..f4db78830f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1137,6 +1137,7 @@ dist_patch_DATA = \
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
+ %D%/packages/patches/fbreader-fix-icon.patch \
%D%/packages/patches/fenics-dolfin-algorithm.patch \
%D%/packages/patches/fenics-dolfin-demo-init.patch \
%D%/packages/patches/fenics-dolfin-boost.patch \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 6962547c75..16d4fcd6e3 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -454,7 +454,8 @@ designed to be used in a generic text renderer.")
(sha256
(base32
"0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d"))
- (patches (search-patches "fbreader-curl-7.62.patch"))))
+ (patches (search-patches "fbreader-curl-7.62.patch"
+ "fbreader-fix-icon.patch"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
diff --git a/gnu/packages/patches/fbreader-fix-icon.patch b/gnu/packages/patches/fbreader-fix-icon.patch
new file mode 100644
index 0000000000..635abf6a43
--- /dev/null
+++ b/gnu/packages/patches/fbreader-fix-icon.patch
@@ -0,0 +1,29 @@
+Author: Danny Milosavljevic <dannym+a@scratchpost.org>
+Date: 2023-08-15
+
+--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop 2023-08-14 23:56:03.092567740 +0200
++++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/desktop 2023-08-14 23:56:59.936213278 +0200
+@@ -25,5 +25,5 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Icon=FBReader.png
++Icon=FBReader
+ Categories=Office;Viewer;Literature;
+--- orig/jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile 2023-08-14 23:56:03.092567740 +0200
++++ jswba9mn9nh43l7g4w2qslmr7i3q64vy-fbreader-0.99.6-checkout/fbreader/desktop/Makefile 2023-08-15 00:23:19.046691430 +0200
+@@ -10,6 +10,14 @@
+ @install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop
+ @install -d $(DESTDIR)$(IMAGEDIR)
+ @install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png
++ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
++ @install -m 0644 ../data/icons/application/16x16.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/FBReader.png
++ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
++ @install -m 0644 ../data/icons/application/32x32.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/FBReader.png
++ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps
++ @install -m 0644 ../data/icons/application/48x48.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/FBReader.png
++ @install -d $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
++ @install -m 0644 ../data/icons/application/64x64.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/FBReader.png
+ @install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml
+ @install -m 0644 ../data/default/keymap.desktop.xml $(SHARE_FBREADER)/default/keymap.xml
+ @install -m 0644 ../data/default/styles.desktop.xml $(SHARE_FBREADER)/default/styles.xml