Skip to contentSkip to conversation

gtksourceview4: initial add 4.2.0

PATCH New Andreas Müller 1 participant 8 messages May 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 gtksourceview4: initial add 4.2.0

gedit 3.x will depend on it

---
 .../gtksourceview/gtksourceview4_4.2.0.bb     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb
meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb new file +21 -0
new file mode 100644
index 000000000..10deaffb8
@@ -0,0 +1,21 @@
+SUMMARY = "Portable C library for multiline text editing"
+HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native"
+
+PNAME = "gtksourceview"
+
+S = "${WORKDIR}/${PNAME}-${PV}"
+
+inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz"
+SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99"
+SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675"
+
+FILES_${PN} += "${datadir}/gtksourceview-4"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/8 gtksourceview-classic-light: extend to gtksourceview4

Adds classic-light to gtksourceview4. Classic-light enables dark text on white background when using dark themes.
Tested with gedit V3.

---
 .../gtksourceview/gtksourceview-classic-light_1.0.bb           | 3 +++
 1 file changed, 3 insertions(+)
meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +3 -0
index e7dc0f865..7dabd1e39 100644
@@ -13,9 +13,12 @@ do_install() {
     install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-2.0/styles/
     install -d ${D}${datadir}/gtksourceview-3.0/styles
     install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/
+    install -d ${D}${datadir}/gtksourceview-4/styles
+    install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/
 }
 
 FILES_${PN} = " \
     ${datadir}/gtksourceview-2.0/styles \
     ${datadir}/gtksourceview-3.0/styles \
+    ${datadir}/gtksourceview-4/styles \
 "
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/8 itstool: rework - it went out too early

In reply to Andreas Müller

* adjust dependencies
* adjust shebang correctly - caused errors not easy to debug in dependent packages

---
 meta-oe/recipes-support/itstool/itstool_2.0.5.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-support/itstool/itstool_2.0.5.bb +3 -3
index b74d5f607..166e95b3a 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5"
 
 inherit autotools python3native
 
-DEPENDS = "python3-native python3-lxml-native"
+DEPENDS = "python3-lxml-native"
 
 SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "655c6f78fc64faee45adcc45ccc5a57e"
@@ -13,10 +13,10 @@ SRC_URI[sha256sum] = "100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100
 
 do_install_append() {
     # fix shebang of main script
-    sed -i 's:${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}:${bindir}/${PYTHON_PN}:g' ${D}${bindir}/itstool
+    sed -i 's:^#!${WORKDIR}.*${PYTHON_PN} -s:#!${bindir_native}/${PYTHON_PN} -s:' ${D}${bindir}/itstool
 }
 
 BBCLASSEXTEND = "native"
 
-RDEPENDS_${PN} += "python3 python3-lxml"
+RDEPENDS_${PN} += "python3-lxml"
 
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/8 fontforge: upgrade 20170731 -> 20190413

In reply to Andreas Müller

* Features added and bugs fixed. For more information see [1]
* add gtk-icon-cache mime to inherit

[1] https://github.com/fontforge/fontforge/releases

---
 .../{fontforge_20170731.bb => fontforge_20190413.bb}  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-graphics/fontforge/{fontforge_20170731.bb => fontforge_20190413.bb} (88%)
meta-oe/recipes-graphics/fontforge/fontforge_20190413.bb renamed from meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb +6 -5
similarity index 88%
rename from meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
rename to meta-oe/recipes-graphics/fontforge/fontforge_20190413.bb
index 661b5e8c5..ee3bc58bc 100644
@@ -3,19 +3,19 @@ HOMEPAGE = "http://fontforge.github.io/en-US/"
 LICENSE = "BSD-3-Clause & GPLv3"
 LIC_FILES_CHKSUM = " \
     file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
+    file://LICENSE;md5=5f9637af5c51f2e8d06385ef38eb48f1 \
 "
 
 DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gnulib gettext-native"
 DEPENDS_append_class-target = " libxi"
 
-inherit autotools pkgconfig pythonnative distro_features_check gettext
+inherit autotools pkgconfig pythonnative distro_features_check gettext gtk-icon-cache mime
 
 REQUIRED_DISTRO_FEATURES_append_class-target = " x11"
 
 SRC_URI = "git://github.com/${BPN}/${BPN}.git"
-# tag 20170731
-SRCREV = "b9149c13e8f9464fc21473f1f676b36a2130775d"
+# tag 20190413
+SRCREV = "7f6f1d021fdfea7789972f9534ba3241616d8dfc"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_class-native = " with_x=no"
@@ -50,8 +50,9 @@ PACKAGES =+ "${PN}-python"
 RPROVIDES_${PN}-dbg += "${PN}-python-dbg"
 
 FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${datadir}/metainfo \
     ${datadir}/mime \
-    ${datadir}/icons \
 "
 
 FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python"
Signature · 1 line
2.20.1
#4 lore raw

PATCH 5/8 exo: upgrade 0.12.4 -> 0.12.5

In reply to Andreas Müller

This is a bugfix and cleanup release [1]

[1] https://mail.xfce.org/pipermail/xfce/2019-May/036395.html

---
 .../reduce-build-to-exo-csource-only.patch    | 29 +++++++++++--------
 .../exo/{exo_0.12.4.bb => exo_0.12.5.bb}      |  9 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)
 rename meta-xfce/recipes-xfce/exo/{exo_0.12.4.bb => exo_0.12.5.bb} (81%)
meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +17 -12
index 076477581..8c950299f 100644
@@ -1,6 +1,6 @@
 From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Thu, 28 Mar 2013 23:41:03 +0100
+Date: Sat, 4 May 2019 14:50:11 +0200
 Subject: [PATCH] reduce build to exo-csource only
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -16,11 +16,11 @@ Signed-off-by: Andreas Müller <[email protected]>
 
 ---
  Makefile.am  | 10 +---------
- configure.ac | 22 ----------------------
- 2 files changed, 1 insertion(+), 31 deletions(-)
+ configure.ac | 20 --------------------
+ 2 files changed, 1 insertion(+), 29 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 62ad18d..bdc5fae 100644
+index 62ad18d..8934f1f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,15 +1,7 @@
@@ -41,10 +41,10 @@ index 62ad18d..bdc5fae 100644
  distclean-local:
  	rm -rf *.cache *~
 diff --git a/configure.ac b/configure.ac
-index 3f92d1b..0d4cc38 100644
+index 4e4eb5e..237184c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -116,15 +116,6 @@ AC_PROG_CC()
+@@ -120,15 +120,6 @@ AC_PROG_CC()
  AM_PROG_CC_C_O()
  AC_PROG_INSTALL()
  IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
@@ -60,26 +60,31 @@ index 3f92d1b..0d4cc38 100644
  
  dnl ***************************************
  dnl *** Check for standard header files ***
-@@ -171,19 +162,6 @@ dnl ***********************************
+@@ -175,12 +166,6 @@ dnl ***********************************
  dnl *** Check for required packages ***
  dnl ***********************************
  XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
 -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
--XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
 -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
--XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
 -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
 -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
--
+ 
+ dnl ***********************************************************
+ dnl *** Optional support for a GTK+2 version of the library ***
+@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
+                            [GTK+ 2 support])
+ AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
+ 
 -dnl *********************
 -dnl *** Check for X11 ***
 -dnl *********************
 -XDT_CHECK_LIBX11_REQUIRE()
- 
+-
  dnl *************************
  dnl *** Check for gtk-doc ***
+ dnl *************************
 -- 
-2.14.3
+2.20.1
 
meta-xfce/recipes-xfce/exo/exo_0.12.5.bb renamed from meta-xfce/recipes-xfce/exo/exo_0.12.4.bb +5 -4
similarity index 81%
rename from meta-xfce/recipes-xfce/exo/exo_0.12.4.bb
rename to meta-xfce/recipes-xfce/exo/exo_0.12.5.bb
index 7b7edfe1b..7d61e8f83 100644
@@ -20,15 +20,16 @@ SRC_URI_append_class-native = " \
     file://reduce-build-to-exo-csource-only.patch \
 "
 
-SRC_URI[md5sum] = "962bbccb38db0aecd4151ca97f6a39bc"
-SRC_URI[sha256sum] = "b0af60816bdb572ce53f19462fb1f3a5895a04017a878893dc03c166ea2050af"
+SRC_URI[md5sum] = "1de1d539262847d49474d20cbebc78ea"
+SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8"
 
 PACKAGES =+ "exo-csource"
 
 # Note: python bindings did not work in oe-dev and are about to be moved to
 # pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560
-FILES_${PN} += "${datadir}/xfce4/ \
-                ${libdir}/xfce4/exo-1 \
+FILES_${PN} += " \
+    ${datadir}/xfce4/ \
+    ${libdir}/xfce4/exo* \
 "
 
 FILES_exo-csource += "${bindir}/exo-csource"
Signature · 1 line
2.20.1
#5 lore raw

PATCH 6/8 xfce4-places-plugin: upgrade 1.7.0 -> 1.8.0

In reply to Andreas Müller

* Most notable change is port to GTK3. Futher info at [1]
* Added SUMMARY and reworked DESCRIPTION slightly

[1] https://mail.xfce.org/pipermail/xfce/2019-May/036394.html

---
 ...places-plugin_1.7.0.bb => xfce4-places-plugin_1.8.0.bb} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-panel-plugins/places/{xfce4-places-plugin_1.7.0.bb => xfce4-places-plugin_1.8.0.bb} (58%)
meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb renamed from meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb +4 -3
similarity index 58%
rename from meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb
rename to meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb
index 16be09dca..698152bae 100644
@@ -1,12 +1,13 @@
-DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media"
+SUMMARY = "Menu for quick access to folders, documents and removable media"
+DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media"
 HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "fcae9b38a8affcd82699a94991bba29b"
-SRC_URI[sha256sum] = "4175c614749abbb5bcf6f49c88125fb0dd36db69f4c374df23563907b16e2c3f"
+SRC_URI[md5sum] = "e3a306d927befb8afcb5212f8ab0b8c9"
+SRC_URI[sha256sum] = "7ba3f46f88c2845cbf413efeefaed29157f8b98571856c6e2bf35e4de5d8ecce"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
Signature · 1 line
2.20.1
#6 lore raw

PATCH 7/8 xfce4-datetime-plugin: upgrade 0.7.0 -> 0.7.1

In reply to Andreas Müller

Prettyficatons, translations and minor bugfixes [1]

[1] https://mail.xfce.org/pipermail/xfce/2019-April/036390.html

---
 ...atetime-plugin_0.7.0.bb => xfce4-datetime-plugin_0.7.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/datetime/{xfce4-datetime-plugin_0.7.0.bb => xfce4-datetime-plugin_0.7.1.bb} (66%)
meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb renamed from meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb +2 -2
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb
rename to meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb
index af38ba543..97aa184b0 100644
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "30caaa94c6c267827a31ad69fa472e51"
-SRC_URI[sha256sum] = "297f3077f7aee52a237449fbd8595e232267bc600b5b9e7ddc5baab306ed67b9"
+SRC_URI[md5sum] = "c42149ec71836fe83085511429e638dc"
+SRC_URI[sha256sum] = "e0c7321346ded2539c4688c593f650696ed0ddca0a5f9d4e404d0e7fc42ae256"
Signature · 1 line
2.20.1
#7 lore raw

PATCH 8/8 xfce4-notifyd: upgrade 0.4.3 -> 0.4.4

In reply to Andreas Müller

* A bugfix release [1]
* Dependency on dbus-glib-native (dbus-binding-tool) is no more required [2]

[1] https://mail.xfce.org/pipermail/xfce/2019-April/036382.html
[2] https://git.xfce.org/apps/xfce4-notifyd/commit?id=841b4e4ddc2f757180e1c76fb32d85db2e88cbc4

---
 .../{xfce4-notifyd_0.4.3.bb => xfce4-notifyd_0.4.4.bb}       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.4.3.bb => xfce4-notifyd_0.4.4.bb} (82%)
meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb renamed from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb +2 -3
similarity index 82%
rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb
rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb
index d7719051b..06ab0dfeb 100644
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = " \
     dbus \
     dbus-glib \
-    dbus-glib-native \
     libnotify \
     libxfce4util \
     libxfce4ui \
@@ -15,8 +14,8 @@ DEPENDS = " \
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "4887c62dfcb4c3e4f45c9acfb3def515"
-SRC_URI[sha256sum] = "293dda084cfca4887ae740e2725fdfc64412bc10eac7a55a924eb14482dceac0"
+SRC_URI[md5sum] = "9614d4f7c0790e8ab24e55896a44a8ac"
+SRC_URI[sha256sum] = "090571acf94c423003426cb779fb23e8545c68bab6485563b589c7def8a21b55"
 
 # Avoid trouble with other desktops e.g KDE which also ships dbus service named
 # org.freedesktop.Notifications
Signature · 1 line
2.20.1