[meld/flatpak-ci] build_helpers: Partially fix setup.py build



commit 04ba793b84debcbc499e452d7abe93f614157372
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 1 07:48:09 2019 +1000

    build_helpers: Partially fix setup.py build
    
    This does *not* bring it up to par with the meson build, but most of
    the inconsistencies shouldn't matter for the Windows build.

 meld/build_helpers.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/meld/build_helpers.py b/meld/build_helpers.py
index 1772aa01..badc52fa 100644
--- a/meld/build_helpers.py
+++ b/meld/build_helpers.py
@@ -90,7 +90,7 @@ class build_data(distutils.cmd.Command):
     # FIXME: This is way too much hard coding, but I really hope
     # it also doesn't last that long.
     resource_source = "meld/resources/meld.gresource.xml"
-    resource_target = "org.gnome.meld.gresource"
+    resource_target = "org.gnome.Meld.gresource"
 
     def initialize_options(self):
         pass
@@ -328,6 +328,12 @@ class build_i18n(distutils.cmd.Command):
             os.environ["XGETTEXT_ARGS"] = "--msgid-bugs-address=%s " % \
                                           self.bug_contact
 
+        import shutil
+        shutil.copyfile(
+            'data/org.gnome.meld.desktop.in.in',
+            'data/org.gnome.meld.desktop.in',
+        )
+
         self._rebuild_po()
 
         intltool_switches = [


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]