[libhandy/wip/exalm/parallel: 2/3] glade: Make parallel-installable with 0.x



commit 8eb201011e74de455e23375a15dd23f5aadb92d1
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed May 27 17:13:17 2020 +0500

    glade: Make parallel-installable with 0.x
    
    Rename the sofile and the catalog xml to avoid duplicate filenames.
    
    Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/278
    
    Signed-off-by: Alexander Mikhaylenko <alexm gnome org>

 glade/libhandy.xml | 2 +-
 glade/meson.build  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/glade/libhandy.xml b/glade/libhandy.xml
index 670f0524..d10b642c 100644
--- a/glade/libhandy.xml
+++ b/glade/libhandy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glade-catalog name="libhandy" library="glade-handy" depends="gtk+" book="libhandy">
+<glade-catalog name="libhandy" library="glade-handy-1" depends="gtk+" book="libhandy">
   <glade-widget-classes>
     <glade-widget-class name="HdyActionRow" generic-name="actionrow" title="Action Row" since="0.0.6">
       <properties>
diff --git a/glade/meson.build b/glade/meson.build
index d1678f35..e055f65c 100644
--- a/glade/meson.build
+++ b/glade/meson.build
@@ -39,7 +39,7 @@ libglade_hdy_deps = [
 libglade_hdy_args = []
 # Our custom glade module
 libglade_hdy = shared_library(
-  'glade-handy',
+  'glade-handy-' + apiversion,
   libglade_hdy_sources,
                c_args: libglade_hdy_args,
          dependencies: libglade_hdy_deps,
@@ -61,6 +61,9 @@ if xmllint.found()
 endif
 
 # Install glade catalog
-install_data(glade_xml, install_dir: glade_catalogdir)
+install_data(
+  glade_xml,
+       rename: 'libhandy-@0@.xml'.format(apiversion),
+  install_dir: glade_catalogdir)
 
 endif


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