Skip to contentSkip to conversation

libpeas: initial add 1.22.0

PATCH New Andreas Müller 1 participant 4 messages Feb 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 libpeas: initial add 1.22.0

Am working on a rebirth of midori (no it's not dead) at meta-browser. To avoid an additional layer dependency for meta-browser, put libpeas to meta-oe.

---
 .../recipes-gnome/libpeas/libpeas_1.22.0.bb   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb
meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb new file +24 -0
new file mode 100644
index 000000000..c1ead0670
@@ -0,0 +1,24 @@
+SUMMARY = "libpeas is a gobject-based plugins engine"
+HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
+
+DEPENDS = "gnome-common gtk+3 intltool-native"
+
+inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache
+
+SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558"
+SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962"
+
+PACKAGECONFIG[python3] = "--enable-python3,--disable-python3,python3-pygobject"
+
+export GIR_EXTRA_LIBS_PATH = "${B}/libpeas/.libs"
+
+PACKAGES =+ "${PN}-demo ${PN}-python3"
+FILES_${PN}-demo = " \
+    ${bindir}/peas-demo \
+    ${libdir}/peas-demo \
+"
+
+RDEPENDS_${PN}-python3 = "python3-pygobject"
+FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 geany: upgrade 1.31 -> 1.34.1 and build with gtk+3

---
 .../geany/{geany_1.31.bb => geany_1.34.1.bb}                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-devtools/geany/{geany_1.31.bb => geany_1.34.1.bb} (64%)
meta-oe/recipes-devtools/geany/geany_1.34.1.bb renamed from meta-oe/recipes-devtools/geany/geany_1.31.bb +3 -3
similarity index 64%
rename from meta-oe/recipes-devtools/geany/geany_1.31.bb
rename to meta-oe/recipes-devtools/geany/geany_1.34.1.bb
index bb9d8bc29..aab535d85 100644
@@ -3,15 +3,15 @@ HOMEPAGE = "http://www.geany.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5"
 
-DEPENDS = "gtk+ libxml-parser-perl-native python3-docutils-native intltool-native"
+DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native"
 
 inherit distro_features_check autotools pkgconfig perlnative pythonnative gettext
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://download.geany.org/${BP}.tar.bz2"
-SRC_URI[md5sum] = "386000be6b26972c6a699939c37cda34"
-SRC_URI[sha256sum] = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5"
+SRC_URI[md5sum] = "87220f4a0e03623ab9d86820f6be7b5d"
+SRC_URI[sha256sum] = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11"
 
 FILES_${PN} += "${datadir}/icons"
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/4 geany-plugins: upgrade 1.31 -> 1.34 and rework

In reply to Andreas Müller

* geany-plugins-treebrowser/license checksum: Was changed to:
"TreeBrowser plugin is distributed under the same license as in geany." Geany is GPLv2 which is part of geany-plugin's license.

* Remove explicit RDEPENDS:
* They caused cyclic dependencies making impossible anything but all plugins
* Checked: Dependencies are set correct automatically
* Add geany-plugins-common to avoid cylcic dependencies

* All plugins that are enabled, build and pack properly. Before adding geany-plugins to an image caused errors in do_rootfs due to empty packages.

* Some plugins don't build with gtk3 - disable them

---
 .../0001-Use-pkg-config-to-find-gpgme.patch   |  31 +++++
 ...-plugins_1.31.bb => geany-plugins_1.34.bb} | 111 +++++++-----------
 2 files changed, 74 insertions(+), 68 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-Use-pkg-config-to-find-gpgme.patch
 rename meta-oe/recipes-devtools/geany/{geany-plugins_1.31.bb => geany-plugins_1.34.bb} (75%)
meta-oe/recipes-devtools/geany/geany-plugins/0001-Use-pkg-config-to-find-gpgme.patch new file +31 -0
new file mode 100644
index 000000000..9030f36d4
@@ -0,0 +1,31 @@
+From 0c24f99ca4d4f64ea8584347ca6ae0d638d625a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Mon, 18 Feb 2019 16:13:17 +0100
+Subject: [PATCH] Use pkg-config to find gpgme
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ build/bundled/gpgme.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/bundled/gpgme.m4 b/build/bundled/gpgme.m4
+index 44bf43c..c9a8ae6 100644
+--- a/build/bundled/gpgme.m4
++++ b/build/bundled/gpgme.m4
+@@ -18,7 +18,7 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+   if test "x$gpgme_config_prefix" != x ; then
+       GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
+   fi
+-  AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
++  GPGME_CONFIG="pkg-config gpgme"
+ 
+   if test "$GPGME_CONFIG" != "no" ; then
+     gpgme_version=`$GPGME_CONFIG --version`
+-- 
+2.20.1
+
meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb renamed from meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb +43 -68

294 lines not on this page · raw message

Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/4 xarchiver: upgrade to upstream 0.5.4.14

In reply to Andreas Müller

* build with gtk+3
* add 7z support

---
 .../recipes-apps/xarchiver/xarchiver_git.bb   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +14 -7
index a27c8f553..7445cd7c5 100644
@@ -5,22 +5,29 @@ SECTION = "x11"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native"
+DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native"
 
-SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master"
-SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814"
-PV = "0.5.3"
+SRC_URI = "git://github.com/ib/xarchiver.git"
+SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6"
+PV = "0.5.4.14"
 S = "${WORKDIR}/git"
 
-inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check
+inherit gettext pkgconfig autotools gtk-icon-cache distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin
 EXTRA_OECONF += "--libexecdir=${libdir}"
 
-EXTRA_OECONF += "--enable-maintainer-mode"
+EXTRA_OECONF += " \
+    --enable-maintainer-mode \
+    --disable-doc \
+"
+
+do_configure_prepend() {
+     touch ${S}/NEWS ${S}/AUTHORS
+}
 
 FILES_${PN} += "${libdir}/thunar-archive-plugin"
 
-RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz"
+RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz p7zip"
Signature · 1 line
2.20.1