Fix missing terminal newline and bogus executable permissions

2023-11-09 11:40:47 -05:00 · 2023-11-09 11:40:47 -05:00 · 79a1fbe52a
commit 79a1fbe52a
parent 070a32ef2e
3 changed files with 202 additions and 0 deletions
--- a/136.patch
+++ b/136.patch
@ -0,0 +1,148 @@
+From 7e36d18893d678a6852fa63e7dfd20e6e012d780 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 9 Nov 2023 11:26:26 -0500
+Subject: [PATCH] Ensure all text files have terminal newlines
+
+While some tools support text files without these, proper POSIX text
+files should have them.
+---
+ .travis.yml                                       | 2 +-
+ data/application.css                              | 2 +-
+ data/com.github.donadigo.appeditor.appdata.xml.in | 2 +-
+ data/com.github.donadigo.appeditor.contract       | 2 +-
+ data/com.github.donadigo.appeditor.gresource.xml  | 2 +-
+ data/com.github.donadigo.appeditor.gschema.xml    | 2 +-
+ meson/post_install.py                             | 2 +-
+ meson_options.txt                                 | 2 +-
+ po/meson.build                                    | 2 +-
+ src/AppDirectoryScanner.vala                      | 2 +-
+ src/IconChooserDialog.vala                        | 2 +-
+ src/IconListBox.vala                              | 2 +-
+ 12 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index db1c04a..0151138 100644
+--- a/.travis.yml
+++ b/.travis.yml
+@@ -21,4 +21,4 @@ install:
+   - npm i -g @elementaryos/houston
+ 
+ script:
+-  - houston ci
+\ No newline at end of file
+  - houston ci
+diff --git a/data/application.css b/data/application.css
+index 348573a..0d96a53 100644
+--- a/data/application.css
+++ b/data/application.css
+@@ -52,4 +52,4 @@ window {
+ 
+ entry {
+     border-bottom-color: rgba(0, 0, 0, 0.2);
+-}
+\ No newline at end of file
+}
+diff --git a/data/com.github.donadigo.appeditor.appdata.xml.in b/data/com.github.donadigo.appeditor.appdata.xml.in
+index 94e6c5c..64d9703 100644
+--- a/data/com.github.donadigo.appeditor.appdata.xml.in
+++ b/data/com.github.donadigo.appeditor.appdata.xml.in
+@@ -195,4 +195,4 @@
+     <value key="x-appcenter-color-primary-text">#0A332D</value>
+     <value key="x-appcenter-suggested-price">5</value>
+   </custom>
+-</component>
+\ No newline at end of file
+</component>
+diff --git a/data/com.github.donadigo.appeditor.contract b/data/com.github.donadigo.appeditor.contract
+index fab6d62..6a0180d 100644
+--- a/data/com.github.donadigo.appeditor.contract
+++ b/data/com.github.donadigo.appeditor.contract
+@@ -3,4 +3,4 @@ Name=Create a Menu Entry
+ Description=Create a new menu entry for executing this file
+ Icon=com.github.donadigo.appeditor
+ MimeType=application/x-executable;text/x-python;application/x-shellscript
+-Exec=com.github.donadigo.appeditor -c %f
+\ No newline at end of file
+Exec=com.github.donadigo.appeditor -c %f
+diff --git a/data/com.github.donadigo.appeditor.gresource.xml b/data/com.github.donadigo.appeditor.gresource.xml
+index 68c0271..814b522 100644
+--- a/data/com.github.donadigo.appeditor.gresource.xml
+++ b/data/com.github.donadigo.appeditor.gresource.xml
+@@ -3,4 +3,4 @@
+   <gresource prefix="/com/github/donadigo/appeditor">
+     <file alias="application.css" compressed="true">application.css</file>
+   </gresource>
+-</gresources>
+\ No newline at end of file
+</gresources>
+diff --git a/data/com.github.donadigo.appeditor.gschema.xml b/data/com.github.donadigo.appeditor.gschema.xml
+index 4fab585..6896576 100644
+--- a/data/com.github.donadigo.appeditor.gschema.xml
+++ b/data/com.github.donadigo.appeditor.gschema.xml
+@@ -22,4 +22,4 @@
+             <description>Whether entries with NoDisplay set to true should show</description>
+         </key>
+     </schema>
+-</schemalist>
+\ No newline at end of file
+</schemalist>
+diff --git a/meson/post_install.py b/meson/post_install.py
+index 9eaefa9..76ed255 100644
+--- a/meson/post_install.py
+++ b/meson/post_install.py
+@@ -7,4 +7,4 @@
+ 
+ if not os.environ.get('DESTDIR'):
+ 	print('Compiling gsettings schemas...')
+-	subprocess.call(['glib-compile-schemas', schemadir])
+\ No newline at end of file
+	subprocess.call(['glib-compile-schemas', schemadir])
+diff --git a/meson_options.txt b/meson_options.txt
+index de6c8e3..7dce56d 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -1 +1 @@
+-option('flatpak', type : 'boolean', value : 'false', description : 'Disables some defunct features when building with Flatpak')
+\ No newline at end of file
+option('flatpak', type : 'boolean', value : 'false', description : 'Disables some defunct features when building with Flatpak')
+diff --git a/po/meson.build b/po/meson.build
+index 5eab52e..e9b77d7 100644
+--- a/po/meson.build
+++ b/po/meson.build
+@@ -1 +1 @@
+-i18n.gettext(meson.project_name(), preset: 'glib')
+\ No newline at end of file
+i18n.gettext(meson.project_name(), preset: 'glib')
+diff --git a/src/AppDirectoryScanner.vala b/src/AppDirectoryScanner.vala
+index 9b0d69e..fad3d7f 100644
+--- a/src/AppDirectoryScanner.vala
+++ b/src/AppDirectoryScanner.vala
+@@ -56,4 +56,4 @@ public class AppEditor.AppDirectoryScanner : Object {
+ 
+         return apps_dir;
+     }
+-}
+\ No newline at end of file
+}
+diff --git a/src/IconChooserDialog.vala b/src/IconChooserDialog.vala
+index 2ce0faf..abf24c9 100644
+--- a/src/IconChooserDialog.vala
+++ b/src/IconChooserDialog.vala
+@@ -90,4 +90,4 @@ public class AppEditor.IconChooserDialog : Gtk.Dialog {
+         icon_list_box.search (search_entry.text);
+         icon_list_box.invalidate_filter ();
+     }
+-}
+\ No newline at end of file
+}
+diff --git a/src/IconListBox.vala b/src/IconListBox.vala
+index dcbade6..77e6dea 100644
+--- a/src/IconListBox.vala
+++ b/src/IconListBox.vala
+@@ -161,4 +161,4 @@ public class AppEditor.IconListBox : Gtk.ListBox {
+     private static bool query_matches_name (string query, string icon_name) {
+         return query.down () in icon_name.down ();
+     }
+-}
+\ No newline at end of file
+}
--- a/138.patch
+++ b/138.patch
@ -0,0 +1,48 @@
+From caa2c26a3de12b78f2b2f1d7fe82585ae2ba2ed3 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 9 Nov 2023 11:34:00 -0500
+Subject: [PATCH] Remove executable bit from files that are not script-like
+
+---
+ meson.build                | 0
+ src/AppItem.vala           | 0
+ src/AppSourceList.vala     | 0
+ src/Application.vala       | 0
+ src/CategoryItem.vala      | 0
+ src/Constants.vala         | 0
+ src/DesktopAppManager.vala | 0
+ src/MainWindow.vala        | 0
+ 8 files changed, 0 insertions(+), 0 deletions(-)
+ mode change 100755 => 100644 meson.build
+ mode change 100755 => 100644 src/AppItem.vala
+ mode change 100755 => 100644 src/AppSourceList.vala
+ mode change 100755 => 100644 src/Application.vala
+ mode change 100755 => 100644 src/CategoryItem.vala
+ mode change 100755 => 100644 src/Constants.vala
+ mode change 100755 => 100644 src/DesktopAppManager.vala
+ mode change 100755 => 100644 src/MainWindow.vala
+
+diff --git a/meson.build b/meson.build
+old mode 100755
+new mode 100644
+diff --git a/src/AppItem.vala b/src/AppItem.vala
+old mode 100755
+new mode 100644
+diff --git a/src/AppSourceList.vala b/src/AppSourceList.vala
+old mode 100755
+new mode 100644
+diff --git a/src/Application.vala b/src/Application.vala
+old mode 100755
+new mode 100644
+diff --git a/src/CategoryItem.vala b/src/CategoryItem.vala
+old mode 100755
+new mode 100644
+diff --git a/src/Constants.vala b/src/Constants.vala
+old mode 100755
+new mode 100644
+diff --git a/src/DesktopAppManager.vala b/src/DesktopAppManager.vala
+old mode 100755
+new mode 100644
+diff --git a/src/MainWindow.vala b/src/MainWindow.vala
+old mode 100755
+new mode 100644
--- a/appeditor.spec
+++ b/appeditor.spec
@ -28,6 +28,12 @@ Patch:          %{url}/pull/122.patch
 # Fix deprecated top-level developer_name in AppData XML
 # https://github.com/donadigo/appeditor/pull/135
 Patch:          %{url}/pull/135.patch
+# Ensure all text files have terminal newlines
+# https://github.com/donadigo/appeditor/pull/136
+Patch:          %{url}/pull/136.patch
+# Remove executable bit from files that are not script-like
+# https://github.com/donadigo/appeditor/pull/138
+Patch:          %{url}/pull/138.patch

 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}