diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-08-15 23:56:00 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-08-16 08:00:54 -0700 |
commit | 947bd5636d6e72b5529f1c18da8da5c031e0cdd2 (patch) | |
tree | 0005af1fc85dddd22ea2ec6d0e9510559d42ff2c /meta-xfce/recipes-apps | |
parent | 448f0fb2ba6d03f95406b8d2c9428d6c70779763 (diff) | |
download | meta-openembedded-947bd5636d6e72b5529f1c18da8da5c031e0cdd2.tar.gz |
ristretto: upgrade 0.8.4 -> 0.10.0
* GTK3 port
* overall recipe cleanup
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-apps')
3 files changed, 16 insertions, 56 deletions
diff --git a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 5cdc8c728..000000000 --- a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Mon, 22 Jan 2018 15:52:09 +0100 | ||
4 | Subject: [PATCH] Fix build after update of xfconf | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | xfconf stopped using dbus-glib so required flags must be included here | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
14 | --- | ||
15 | src/Makefile.am | 2 ++ | ||
16 | 1 file changed, 2 insertions(+) | ||
17 | |||
18 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
19 | index 36a31dc..3dd56bc 100644 | ||
20 | --- a/src/Makefile.am | ||
21 | +++ b/src/Makefile.am | ||
22 | @@ -30,6 +30,7 @@ ristretto_CFLAGS = \ | ||
23 | $(GIO_UNIX_CFLAGS) \ | ||
24 | $(LIBEXIF_CFLAGS) \ | ||
25 | $(XFCONF_CFLAGS) \ | ||
26 | + $(DBUS_GLIB_CFLAGS) \ | ||
27 | $(EXO_CFLAGS) \ | ||
28 | $(CAIRO_CFLAGS) \ | ||
29 | $(LIBXFCE4UTIL_CFLAGS) \ | ||
30 | @@ -48,6 +49,7 @@ ristretto_LDADD = \ | ||
31 | $(GIO_UNIX_LIBS) \ | ||
32 | $(LIBEXIF_LIBS) \ | ||
33 | $(XFCONF_LIBS) \ | ||
34 | + $(DBUS_GLIB_LIBS) \ | ||
35 | $(EXO_LIBS) \ | ||
36 | $(CAIRO_LIBS) \ | ||
37 | $(LIBXFCE4UTIL_LIBS) \ | ||
38 | -- | ||
39 | 2.14.3 | ||
40 | |||
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb new file mode 100644 index 000000000..9c5bb12e8 --- /dev/null +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Tiny image-viewer" | ||
2 | HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" | ||
3 | SECTION = "x11/application" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" | ||
6 | |||
7 | DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" | ||
8 | |||
9 | inherit xfce-app | ||
10 | |||
11 | RRECOMMENDS_${PN} += "tumbler" | ||
12 | |||
13 | SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc" | ||
14 | SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769" | ||
15 | |||
16 | FILES_${PN} += "${datadir}/metainfo" | ||
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb deleted file mode 100644 index 416ac2adc..000000000 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | SUMMARY = "Tiny image-viewer" | ||
2 | HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" | ||
3 | SECTION = "x11/application" | ||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" | ||
6 | DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo file" | ||
7 | |||
8 | inherit xfce-app | ||
9 | |||
10 | RRECOMMENDS_${PN} += "tumbler" | ||
11 | |||
12 | SRC_URI[md5sum] = "0142c8b9c492cf447e563b00c6204359" | ||
13 | SRC_URI[sha256sum] = "3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2" | ||
14 | SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" | ||
15 | |||
16 | FILES_${PN} += "${datadir}/appdata" | ||