diff options
-rw-r--r-- | meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | 2 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb (renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb) | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 6d107b1b61..616142761e 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | |||
@@ -19,7 +19,7 @@ index 723a10d..e6502f3 100644 | |||
19 | --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 19 | --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml |
20 | +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 20 | +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml |
21 | @@ -75,4 +75,8 @@ | 21 | @@ -75,4 +75,8 @@ |
22 | <property name="<Primary>F12" type="string" value="workspace_12_key"/> | 22 | <property name="<Super>KP_Next" type="string" value="tile_down_right_key"/> |
23 | </property> | 23 | </property> |
24 | </property> | 24 | </property> |
25 | + <property name="providers" type="array"> | 25 | + <property name="providers" type="array"> |
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 348b685be3..7a269ad666 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | |||
@@ -2,17 +2,15 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" | |||
2 | SECTION = "x11/libs" | 2 | SECTION = "x11/libs" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" |
5 | DEPENDS = "intltool-native perl-native gtk+ gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" | 5 | DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" |
6 | 6 | ||
7 | inherit xfce gtk-doc gobject-introspection features_check | 7 | inherit xfce gtk-doc gobject-introspection features_check |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
10 | 10 | ||
11 | SRC_URI += " \ | 11 | # TODO: Check if this can go |
12 | file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ | 12 | SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" |
13 | " | 13 | SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" |
14 | SRC_URI[md5sum] = "50eae4bab5eeced186bce16fb5f802ac" | ||
15 | SRC_URI[sha256sum] = "c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da" | ||
16 | 14 | ||
17 | EXTRA_OECONF += "--with-vendor-info=${DISTRO}" | 15 | EXTRA_OECONF += "--with-vendor-info=${DISTRO}" |
18 | 16 | ||
@@ -20,15 +18,8 @@ PACKAGECONFIG ??= "" | |||
20 | PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" | 18 | PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" |
21 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" | 19 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" |
22 | 20 | ||
23 | PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" | ||
24 | FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*" | ||
25 | FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" | ||
26 | |||
27 | PACKAGES += "${PN}-glade" | 21 | PACKAGES += "${PN}-glade" |
28 | FILES_${PN}-glade = " \ | 22 | FILES_${PN}-glade = " \ |
29 | ${libdir}/glade \ | 23 | ${libdir}/glade \ |
30 | ${datadir}/glade \ | 24 | ${datadir}/glade \ |
31 | " | 25 | " |
32 | |||
33 | RDEPENDS_${PN}-gtk2 = "${PN}" | ||
34 | RDEPENDS_${PN}-gtk3 = "${PN}" | ||