[libhandy/wip/exalm/links] Update repo links

From: Alexander Mikhaylenko <alexm src gnome org>
To: commits-list gnome org
Cc:
Subject: [libhandy/wip/exalm/links] Update repo links
Date: Fri, 22 May 2020 12:48:51 +0000 (UTC)
commit 062e985051e6eeb74d5acab9fa58de91fbfeb27c
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri May 22 16:20:20 2020 +0500

    Update repo links
    
    https://source.puri.sm/Librem5/libhandy -> https://gitlab.gnome.org/GNOME/libhandy
    
    Signed-off-by: Alexander Mikhaylenko <alexm gnome org>

 .gitlab-ci.yml                   | 66 ++++++++++++----------------------------
 README.md                        |  6 ++--
 data/packaging/rpm/libhandy.spec |  4 +--
 debian/control                   |  2 +-
 debian/copyright                 |  2 +-
 doc/build-howto.xml              |  2 +-
 doc/xml/meson.build              |  4 +--
 examples/sm.puri.Handy.Demo.json |  2 +-
 glade/sm.puri.Handy.Glade.json   |  2 +-
 libhandy.doap                    |  2 +-
 lint/api-visibility.sh           |  4 +--
 src/hdy-main.c                   |  2 +-
 src/hdy-preferences-window.c     |  2 +-
 13 files changed, 37 insertions(+), 63 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 932547fe..51a59601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 include:
  - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
+ - 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 stages:
   - build
@@ -22,8 +23,8 @@ before_script:
     ninja -C _build
 
 api-visibility:
-  image: debian:buster
   stage: build
+  before_script: []
   script:
     - lint/api-visibility.sh
 
@@ -116,51 +117,24 @@ lintian-debian-buster-package:
     - package-debian-buster
   extends: .l5-lintian-debian-package
 
-package-flatpak:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  allow_failure: true
-  tags:
-    - flatpak
-  stage: package
+build-flatpak:
+  extends: '.flatpak'
+  stage: build
+  before_script: []
   variables:
-    app_id: "sm.puri.Handy.Demo"
-    manifest_path: "examples/${app_id}.json"
-  artifacts:
-    paths:
-      - "${app_id}-dev.flatpak"
-    expire_in: 1 day
-  before_script:
-    - flatpak install -y --noninteractive gnome-nightly org.gnome.Sdk org.gnome.Platform
-    - rm -rf _build/
-  script:
-    - bash -x .gitlab-ci/flatpak-build.sh "${app_id}" "${manifest_path}"
-  artifacts:
-    when: always
-    paths:
-      - _build/meson-logs/meson-log.txt
-      - sm.puri.Handy.Demo-dev.flatpak
+    MANIFEST_PATH: 'examples/sm.puri.Handy.Demo.json'
+    RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
+    FLATPAK_MODULE: 'libhandy'
+    APP_ID: 'sm.puri.Handy.Demo'
+    BUNDLE: 'sm.puri.Handy.Demo.flatpak'
 
-package-flatpak-glade:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  allow_failure: true
-  tags:
-    - flatpak
-  stage: package
+build-flatpak-glade:
+  extends: '.flatpak'
+  stage: build
+  before_script: []
   variables:
-    app_id: "sm.puri.Handy.Glade"
-    manifest_path: "glade/${app_id}.json"
-  artifacts:
-    paths:
-      - "${app_id}-dev.flatpak"
-    expire_in: 1 day
-  before_script:
-    - flatpak install -y --noninteractive gnome-nightly org.gnome.Sdk org.gnome.Platform
-    - rm -rf _build/
-  script:
-    - bash -x .gitlab-ci/flatpak-build.sh "${app_id}" "${manifest_path}"
-  artifacts:
-    when: always
-    paths:
-      - _build/meson-logs/meson-log.txt
-      - sm.puri.Handy.Glade-dev.flatpak
-
+    MANIFEST_PATH: 'glade/sm.puri.Handy.Glade.json'
+    RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
+    FLATPAK_MODULE: 'libhandy'
+    APP_ID: 'sm.puri.Handy.Glade'
+    BUNDLE: 'sm.puri.Handy.Glade.flatpak'
diff --git a/README.md b/README.md
index 02acab7d..b13e27f9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Handy
-[![Pipeline 
status](https://source.puri.sm/Librem5/libhandy/badges/master/build.svg)](https://source.puri.sm/Librem5/libhandy/commits/master)
-[![Code 
coverage](https://source.puri.sm/Librem5/libhandy/badges/master/coverage.svg)](https://source.puri.sm/Librem5/libhandy/commits/master)
+[![Pipeline 
status](https://gitlab.gnome.org/GNOME/libhandy/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/libhandy/commits/master)
+[![Code 
coverage](https://gitlab.gnome.org/GNOME/libhandy/badges/master/coverage.svg)](https://gitlab.gnome.org/GNOME/libhandy/commits/master)
 
 The aim of the Handy library is to help with developing UI for mobile devices
 using GTK/GNOME.
@@ -11,7 +11,7 @@ libhandy is licensed under the LGPL-2.1+.
 
 ## Build dependencies
 
-To build libhandy you need to first install the build-deps defined by [the debian/control 
file](https://source.puri.sm/Librem5/libhandy/blob/master/debian/control#L6).
+To build libhandy you need to first install the build-deps defined by [the debian/control 
file](https://gitlab.gnome.org/GNOME/libhandy/blob/master/debian/control#L6).
 
 If you are running a Debian based distribution, you can easily install all those the dependencies making use 
of the following command
 
diff --git a/data/packaging/rpm/libhandy.spec b/data/packaging/rpm/libhandy.spec
index 68cf021d..70acaec5 100644
--- a/data/packaging/rpm/libhandy.spec
+++ b/data/packaging/rpm/libhandy.spec
@@ -6,8 +6,8 @@ Release: 1%{?dist}
 Summary: A library full of GTK widgets for mobile phones
 
 License: LGPLv2+
-Url:     https://source.puri.sm/Librem5/libhandy
-Source0: https://source.puri.sm/Librem5/libhandy/archive/master.tar.gz
+Url:     https://gitlab.gnome.org/GNOME/libhandy
+Source0: https://gitlab.gnome.org/GNOME/libhandy/archive/master.tar.gz
 
 BuildRequires: gcc
 BuildRequires: gobject-introspection
diff --git a/debian/control b/debian/control
index c4ad3a61..83adcfd5 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  xvfb <!nocheck>,
  xauth <!nocheck>,
 Standards-Version: 4.1.3
-Homepage: https://source.puri.sm/Librem5/libhandy
+Homepage: https://gitlab.gnome.org/GNOME/libhandy
 Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/libhandy
 Vcs-Git: https://salsa.debian.org/DebianOnMobile-team/libhandy.git
 
diff --git a/debian/copyright b/debian/copyright
index 67d67790..357e8cda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libhandy
-Source: https://source.puri.sm/Librem5/libhandy
+Source: https://gitlab.gnome.org/GNOME/libhandy
 
 Files: *
 Copyright: 2018 Purism SPC
diff --git a/doc/build-howto.xml b/doc/build-howto.xml
index 4d898cbd..2e50dcb6 100644
--- a/doc/build-howto.xml
+++ b/doc/build-howto.xml
@@ -179,7 +179,7 @@
 
     <informalexample>
       <programlisting>
-        git clone https://source.puri.sm/Librem5/libhandy.git
+        git clone https://gitlab.gnome.org/GNOME/libhandy.git
         cd libhandy
         meson . _build
         ninja -C _build test
diff --git a/doc/xml/meson.build b/doc/xml/meson.build
index 2d326307..5f73097a 100644
--- a/doc/xml/meson.build
+++ b/doc/xml/meson.build
@@ -1,10 +1,10 @@
 ent_conf = configuration_data()
 ent_conf.set('PACKAGE', 'Handy')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://source.puri.sm/Librem5/libhandy/issues')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/libhandy/issues')
 ent_conf.set('PACKAGE_NAME', 'Handy')
 ent_conf.set('PACKAGE_STRING', 'libhandy')
 ent_conf.set('PACKAGE_TARNAME', 'libhandy-' + meson.project_version())
-ent_conf.set('PACKAGE_URL', 'https://source.puri.sm/Librem5/libhandy')
+ent_conf.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/libhandy')
 ent_conf.set('PACKAGE_VERSION', meson.project_version())
 ent_conf.set('PACKAGE_API_VERSION', apiversion)
 ent_conf.set('PACKAGE_API_NAME', package_api_name)
diff --git a/examples/sm.puri.Handy.Demo.json b/examples/sm.puri.Handy.Demo.json
index d338d0cc..f59ea8f2 100644
--- a/examples/sm.puri.Handy.Demo.json
+++ b/examples/sm.puri.Handy.Demo.json
@@ -21,7 +21,7 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://source.puri.sm/Librem5/libhandy.git";
+          "url": "https://gitlab.gnome.org/GNOME/libhandy.git";
         }
       ]
     }
diff --git a/glade/sm.puri.Handy.Glade.json b/glade/sm.puri.Handy.Glade.json
index fd0f43c4..ef734582 100644
--- a/glade/sm.puri.Handy.Glade.json
+++ b/glade/sm.puri.Handy.Glade.json
@@ -75,7 +75,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git";
+                    "url" : "https://gitlab.gnome.org/GNOME/libhandy.git";
                 }
             ]
         }
diff --git a/libhandy.doap b/libhandy.doap
index 9f48a89b..91cce3b8 100644
--- a/libhandy.doap
+++ b/libhandy.doap
@@ -9,7 +9,7 @@
   <shortname>libhandy</shortname>
   <shortdesc>A library full of GTK widgets for mobile phones</shortdesc>
   <description>libhandy is a collection of GTK widgets for applications targeting mobile phones. The Librem 
5 phone drives the development of this project.</description>
-  <homepage rdf:resource="https://source.puri.sm/Librem5/libhandy"; />
+  <homepage rdf:resource="https://gitlab.gnome.org/GNOME/libhandy"; />
   <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl"; />
 
   <programming-language>C</programming-language>
diff --git a/lint/api-visibility.sh b/lint/api-visibility.sh
index 077757a6..ce8e7f58 100755
--- a/lint/api-visibility.sh
+++ b/lint/api-visibility.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 # Check that private headers aren't included in public ones.
-if grep "include.*private.h" $(find src -name '*\.h' -not -regex '.*private.h');
+if grep "include.*private.h" $(ls src/*.h | grep -v "private.h");
 then
   echo "Private headers shouldn't be included in public ones."
   exit 1
 fi
 
 # Check that handy.h contains all the public headers.
-for header in $(find src -name '*.h' -not -regex '.*private.h' -not -regex '.*/handy.h');
+for header in $(ls src | grep "\.h$" | grep -v "private.h" | grep -v handy.h);
 do
   if ! grep -q "$(basename $header)" src/handy.h;
   then
diff --git a/src/hdy-main.c b/src/hdy-main.c
index b5724042..161f4dea 100644
--- a/src/hdy-main.c
+++ b/src/hdy-main.c
@@ -30,7 +30,7 @@ G_DEFINE_CONSTRUCTOR(hdy_constructor)
 /* A stupidly high priority used to load the styles before anything else
  * happens.
  *
- * See https://source.puri.sm/Librem5/libhandy/issues/214.
+ * See https://gitlab.gnome.org/GNOME/libhandy/issues/214.
  */
 #define HDY_PRIORITY_STYLE -1000
 
diff --git a/src/hdy-preferences-window.c b/src/hdy-preferences-window.c
index 42dcdba7..9569eeea 100644
--- a/src/hdy-preferences-window.c
+++ b/src/hdy-preferences-window.c
@@ -71,7 +71,7 @@ filter_search_results (HdyActionRow         *row,
    * This works around it by explicitely toggling the row's visibility, while
    * keeping GtkListBox's filtering logic.
    *
-   * See https://source.puri.sm/Librem5/libhandy/merge_requests/424.
+   * See https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/424
    */
 
   if (strstr (title, text)) {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]