File fix.patch of Package komorebi
diff -rub a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2019-08-24 20:25:48.267631000 +0600
+++ b/CMakeLists.txt 2019-08-24 22:28:36.627366672 +0600
@@ -81,19 +81,19 @@
target_link_libraries(komorebi ${DEPS_LIBRARIES} -lm)
target_link_libraries(komorebi-wallpaper-creator ${DEPS_LIBRARIES} -lm)
-install(TARGETS komorebi RUNTIME DESTINATION /usr/local/bin/)
-install(TARGETS komorebi-wallpaper-creator RUNTIME DESTINATION /usr/local/bin/)
+install(TARGETS komorebi RUNTIME DESTINATION /usr/bin/)
+install(TARGETS komorebi-wallpaper-creator RUNTIME DESTINATION /usr/bin/)
######### Wallpapers ############
-install(DIRECTORY data/Wallpapers/ DESTINATION /opt/Komorebi)
+install(DIRECTORY data/Wallpapers/ DESTINATION /usr/share/wallpapers/Komorebi)
######### Fonts ############
install(DIRECTORY data/Fonts/ DESTINATION /usr/share/fonts)
######### Icons ############
-install(DIRECTORY data/Icons/ DESTINATION /opt/Komorebi)
+install(DIRECTORY data/Icons/ DESTINATION /usr/share/Komorebi)
######### Other ############
install(FILES data/Other/komorebi.desktop DESTINATION /usr/share/applications/)
diff -rub a/data/Other/komorebi.desktop b/data/Other/komorebi.desktop
--- a/data/Other/komorebi.desktop 2019-08-24 20:25:48.275631000 +0600
+++ b/data/Other/komorebi.desktop 2019-08-24 22:26:34.542832504 +0600
@@ -2,8 +2,8 @@
Name=Komorebi
Comment=An awesome wallpapers manager
Keywords=wallpaper;settings; preferences;
-Icon=/opt/Komorebi/komorebi.svg
-Exec=/usr/local/bin/komorebi
+Icon=/usr/share/Komorebi/komorebi.svg
+Exec=komorebi
Terminal=false
Type=Application
StartupNotify=true
diff -rub a/data/Other/postinst b/data/Other/postinst
--- a/data/Other/postinst 2019-08-24 20:25:48.275631000 +0600
+++ b/data/Other/postinst 2019-08-24 22:07:02.501039211 +0600
@@ -18,7 +18,7 @@
echo "[INFO]: Updating existing Komorebi Wallpapers.."
-wallpapers=$(ls -d -1 /opt/Komorebi/*/)
+wallpapers=$(ls -d -1 /usr/share/wallpapers/Komorebi/*/)
for wallpaper in $wallpapers; do
diff -rub a/data/Other/wallpapercreator.desktop b/data/Other/wallpapercreator.desktop
--- a/data/Other/wallpapercreator.desktop 2019-08-24 20:25:48.275631000 +0600
+++ b/data/Other/wallpapercreator.desktop 2019-08-24 22:25:52.506648573 +0600
@@ -2,8 +2,8 @@
Name=Wallpaper Creator
Comment=Create wallpapers for Komorebi
Keywords=wallpaper; settings; preferences;
-Icon=/opt/Komorebi/wallpaper_creator.svg
-Exec=/usr/local/bin/komorebi-wallpaper-creator
+Icon=/usr/share/Komorebi/wallpaper_creator.svg
+Exec=komorebi-wallpaper-creator
Terminal=false
Type=Application
StartupNotify=true
diff -rub a/extra/wallpaper-creator/OnScreen/FinalPage.vala b/extra/wallpaper-creator/OnScreen/FinalPage.vala
--- a/extra/wallpaper-creator/OnScreen/FinalPage.vala 2019-08-24 20:25:48.371630000 +0600
+++ b/extra/wallpaper-creator/OnScreen/FinalPage.vala 2019-08-24 22:08:49.686038359 +0600
@@ -21,7 +21,7 @@
public class FinalPage : Box {
- Image logo = new Image.from_file("/opt/Komorebi/done.svg");
+ Image logo = new Image.from_file("/usr/share/wallpapers/Komorebi/done.svg");
Label titleLabel = new Label("");
Label descLabel = new Label("");
@@ -42,7 +42,7 @@
descLabel.justify = Justification.CENTER;
titleLabel.set_markup("<span font='Lato 20'>Done</span>");
- descLabel.set_markup("<span font='Lato Light 12'>Copy the wallpaper folder from your home directory to /opt/Komorebi/Resources\nthen open 'Change Wallpaper' to choose your new wallpaper.</span>");
+ descLabel.set_markup("<span font='Lato Light 12'>Copy the wallpaper folder from your home directory to /usr/share/wallpapers/Komorebi/Resources\nthen open 'Change Wallpaper' to choose your new wallpaper.</span>");
closeButton.margin_top = 20;
closeButton.halign = Align.CENTER;
diff -rub a/extra/wallpaper-creator/OnScreen/InitialPage.vala b/extra/wallpaper-creator/OnScreen/InitialPage.vala
--- a/extra/wallpaper-creator/OnScreen/InitialPage.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/extra/wallpaper-creator/OnScreen/InitialPage.vala 2019-08-24 22:09:37.030374009 +0600
@@ -121,7 +121,7 @@
titleBox.add(titleLabel);
titleBox.add(aboutLabel);
- aboutGrid.attach(new Image.from_file("/opt/Komorebi/wallpaper_creator.svg"), 0, 0, 1, 1);
+ aboutGrid.attach(new Image.from_file("/usr/share/Komorebi/wallpaper_creator.svg"), 0, 0, 1, 1);
aboutGrid.attach(titleBox, 1, 0, 1, 1);
thumbnailBox.add(chooseThumbnailLabel);
diff -rub a/extra/wallpaper-creator/OnScreen/NewWallpaperWindow.vala b/extra/wallpaper-creator/OnScreen/NewWallpaperWindow.vala
--- a/extra/wallpaper-creator/OnScreen/NewWallpaperWindow.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/extra/wallpaper-creator/OnScreen/NewWallpaperWindow.vala 2019-08-24 22:09:59.694534686 +0600
@@ -149,7 +149,7 @@
optionsPage.setImage(filePath);
} else {
addLayerButton.visible = false;
- optionsPage.setImage("/opt/Komorebi/blank.svg");
+ optionsPage.setImage("/usr/share/Komorebi/blank.svg");
}
stack.add_named(optionsPage, "options");
diff -rub a/src/OnScreen/AssetActor.vala b/src/OnScreen/AssetActor.vala
--- a/src/OnScreen/AssetActor.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/AssetActor.vala 2019-08-24 22:11:57.831349628 +0600
@@ -53,10 +53,10 @@
assetHeight = screenHeight;
if(assetWidth != 0 && assetHeight != 0)
- pixbuf = new Gdk.Pixbuf.from_file_at_scale(@"/opt/Komorebi/$wallpaperName/assets.png",
+ pixbuf = new Gdk.Pixbuf.from_file_at_scale(@"/usr/share/wallpapers/Komorebi/$wallpaperName/assets.png",
assetWidth, assetHeight, false);
else
- pixbuf = new Gdk.Pixbuf.from_file(@"/opt/Komorebi/$wallpaperName/assets.png");
+ pixbuf = new Gdk.Pixbuf.from_file(@"/usr/share/wallpapers/Komorebi/$wallpaperName/assets.png");
image.set_data (pixbuf.get_pixels(), pixbuf.has_alpha ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888,
pixbuf.get_width(), pixbuf.get_height(),
diff -rub a/src/OnScreen/BackgroundWindow.vala b/src/OnScreen/BackgroundWindow.vala
--- a/src/OnScreen/BackgroundWindow.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/BackgroundWindow.vala 2019-08-24 22:13:26.219836249 +0600
@@ -314,7 +314,7 @@
if(wallpaperType == "video") {
- var videoPath = @"file:///opt/Komorebi/$wallpaperName/$videoFileName";
+ var videoPath = @"file:///usr/share/wallpapers/Komorebi/$wallpaperName/$videoFileName";
videoPlayback.uri = videoPath;
videoPlayback.playing = true;
@@ -328,7 +328,7 @@
wallpaperActor.set_content(wallpaperImage);
- wallpaperPixbuf = new Gdk.Pixbuf.from_file_at_scale(@"/opt/Komorebi/$wallpaperName/wallpaper.jpg",
+ wallpaperPixbuf = new Gdk.Pixbuf.from_file_at_scale(@"/usr/share/wallpapers/Komorebi/$wallpaperName/wallpaper.jpg",
scaleWidth, scaleHeight, false);
wallpaperImage.set_data (wallpaperPixbuf.get_pixels(), Cogl.PixelFormat.RGB_888,
diff -rub a/src/OnScreen/InfoBox.vala b/src/OnScreen/InfoBox.vala
--- a/src/OnScreen/InfoBox.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/InfoBox.vala 2019-08-24 22:14:00.132022952 +0600
@@ -71,12 +71,12 @@
mode = "dark";
// Images first
- ramImage.set_from_file(@"/opt/Komorebi/ram_$mode.svg");
+ ramImage.set_from_file(@"/usr/share/wallpapers/Komorebi/ram_$mode.svg");
if(getCPUArch() == 32)
- cpuImage.set_from_file(@"/opt/Komorebi/cpu_32_$mode.svg");
+ cpuImage.set_from_file(@"/usr/share/wallpapers/Komorebi/cpu_32_$mode.svg");
else
- cpuImage.set_from_file(@"/opt/Komorebi/cpu_64_$mode.svg");
+ cpuImage.set_from_file(@"/usr/share/wallpapers/Komorebi/cpu_64_$mode.svg");
updateInfo();
diff -rub a/src/OnScreen/InfoWindow.vala b/src/OnScreen/InfoWindow.vala
--- a/src/OnScreen/InfoWindow.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/InfoWindow.vala 2019-08-24 22:14:36.680224163 +0600
@@ -122,7 +122,7 @@
});
// Add widgets
- closeButton.add(new Image.from_file("/opt/Komorebi/close_btn.svg"));
+ closeButton.add(new Image.from_file("/usr/share/wallpapers/Komorebi/close_btn.svg"));
headerBar.pack_start(closeButton, false, false);
topBox.add(titleLabel);
diff -rub a/src/OnScreen/PreferencesWindow.vala b/src/OnScreen/PreferencesWindow.vala
--- a/src/OnScreen/PreferencesWindow.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/PreferencesWindow.vala 2019-08-24 22:15:18.852456344 +0600
@@ -221,7 +221,7 @@
titleBox.add(titleLabel);
titleBox.add(aboutLabel);
- aboutGrid.attach(new Image.from_file("/opt/Komorebi/komorebi.svg"), 0, 0, 1, 1);
+ aboutGrid.attach(new Image.from_file("/usr/share/wallpapers/Komorebi/komorebi.svg"), 0, 0, 1, 1);
aboutGrid.attach(titleBox, 1, 0, 1, 1);
bottomPreferencesBox.pack_start(donateButton);
@@ -232,7 +232,7 @@
preferencesPage.add(showDesktopIconsButton);
preferencesPage.pack_end(bottomPreferencesBox);
- bottomWallpapersBox.add(new Image.from_file("/opt/Komorebi/info.svg"));
+ bottomWallpapersBox.add(new Image.from_file("/usr/share/wallpapers/Komorebi/info.svg"));
bottomWallpapersBox.add(currentWallpaperLabel);
if(!canPlayVideos()) {
diff -rub a/src/OnScreen/Thumbnail.vala b/src/OnScreen/Thumbnail.vala
--- a/src/OnScreen/Thumbnail.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/Thumbnail.vala 2019-08-24 22:16:59.484810232 +0600
@@ -25,7 +25,7 @@
Overlay overlay = new Overlay();
Image thumbnailImage = new Image();
- Image borderImage = new Image.from_file("/opt/Komorebi/thumbnail_border.svg");
+ Image borderImage = new Image.from_file("/usr/share/Komorebi/thumbnail_border.svg");
Revealer revealer = new Revealer();
// Signaled when clicked
@@ -76,7 +76,7 @@
public Thumbnail.Add() {
- thumbnailImage.pixbuf = new Gdk.Pixbuf.from_file_at_scale("/opt/Komorebi/thumbnail_add.svg", 150, 100, false);
+ thumbnailImage.pixbuf = new Gdk.Pixbuf.from_file_at_scale("/usr/share/Komorebi/thumbnail_add.svg", 150, 100, false);
}
diff -rub a/src/OnScreen/WallpapersSelector.vala b/src/OnScreen/WallpapersSelector.vala
--- a/src/OnScreen/WallpapersSelector.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/OnScreen/WallpapersSelector.vala 2019-08-24 22:18:41.585005602 +0600
@@ -26,7 +26,7 @@
public class WallpapersSelector : ScrolledWindow {
- public string path = "/opt/Komorebi/";
+ public string path = "/usr/share/wallpapers/Komorebi/";
Gtk.Grid grid = new Grid();
@@ -68,7 +68,7 @@
thumbnailsList.remove(thumbnail);
- File wallpapersFolder = File.new_for_path("/opt/Komorebi");
+ File wallpapersFolder = File.new_for_path("/usr/share/wallpapers/Komorebi");
try {
@@ -98,7 +98,7 @@
}
} catch {
- print("Could not read directory '/opt/Komorebi/'");
+ print("Could not read directory '/usr/share/wallpapers/Komorebi/'");
}
}
diff -rub a/src/Utilities.vala b/src/Utilities.vala
--- a/src/Utilities.vala 2019-08-24 20:25:48.375630000 +0600
+++ b/src/Utilities.vala 2019-08-24 22:11:25.943146153 +0600
@@ -228,7 +228,7 @@
void readWallpaperFile () {
// Read the config file
- wallpaperKeyFile.load_from_file(@"/opt/Komorebi/$wallpaperName/config", KeyFileFlags.NONE);
+ wallpaperKeyFile.load_from_file(@"/usr/share/wallpapers/Komorebi/$wallpaperName/config", KeyFileFlags.NONE);
// Wallpaper Info
wallpaperType = wallpaperKeyFile.get_string("Info", "WallpaperType");
@@ -279,7 +279,7 @@
assetHeight = wallpaperKeyFile.get_integer ("Asset", "Height");
// Set GNOME's wallpaper to this
- var wallpaperPath = @"/opt/Komorebi/$wallpaperName/wallpaper.jpg";
+ var wallpaperPath = @"/usr/share/wallpapers/Komorebi/$wallpaperName/wallpaper.jpg";
new GLib.Settings("org.gnome.desktop.background").set_string("picture-uri", ("file://" + wallpaperPath));
new GLib.Settings("org.gnome.desktop.background").set_string("picture-options", "stretched");
}
