[meta-oe/meta-gnome 00/15] outstanding patches with fixes

[meta-oe/meta-gnome 00/15] outstanding patches with fixes

[Andreas Müller]

[01-03] further glib 2.36
[04-05] reanimate gnome-terminal
[06-11] pdf-viewer
[11-15] postinst improvements

The following changes since commit 8fec906a4584f9cbc467fb0e406bb6a705848b64:

  smartmontools: import from OE classic (2013-05-07 18:59:01 +0200)

are available in the git repository at:
  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git fixes-here-and-there

Andreas Müller (15):
      libbonobo: fix build with glib 2.36
      libbonobo: remove unreferenced patch
      gnome-vfs: fix build with glib 2.36
      gnome-terminal: move out of nonworking
      gnome-terminal: update to 2.30.2
      poppler: remove unrecognized configure options
      poppler: merge include files into poppler - only poppler requires them
      poppler: update to 0.22.3
      poppler-data: update to 0.4.6 and stylize a bit
      epdfview: move to nonworking
      evince: fix/remove postinst by inheriting gsettings
      dconf: fix/remove postinst by inheriting gsettings
      proftpd: remove postinst - directory can be setup offline in do_install
      gnome-panel: let gconf.bblass take care for postinst
      rp-pppoe: move chmod form postinst to offline do_install

 .../epdfview/epdfview/browser_command.patch        |    0
 .../epdfview/epdfview/fix-format.patch             |    0
 .../epdfview/epdfview/glib-single-include.patch    |    0
 .../epdfview/epdfview/swap-colors.patch            |    0
 .../{ => nonworking}/epdfview/epdfview_0.1.8.bb    |    0
 .../0001-Remove-use-of-G_DISABLE_DEPRECATED.patch  |   47 ++++++++++++++++++++
 .../bonobo/libbonobo/configure-gthread.patch       |   11 -----
 .../recipes-gnome/bonobo/libbonobo_2.24.3.bb       |    3 +-
 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb      |   12 +----
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb   |   12 +----
 .../gnome-panel/gnome-panel_2.32.1.bb              |   14 +-----
 ...kefile.am-remove-DG_DISABLE_DEPRECATED-to.patch |   42 +++++++++++++++++
 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |    9 +++-
 .../0001-Makefile.am-do-not-build-help.patch       |   28 ++++++++++++
 .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb   |   15 ++++++
 .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch |   20 --------
 .../nonworking/gnome/gnome-terminal_2.26.3.bb      |   19 --------
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   16 ++-----
 .../recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb     |   10 +---
 ...poppler-data_0.4.5.bb => poppler-data_0.4.6.bb} |    8 ++--
 meta-oe/recipes-support/poppler/poppler-fpu.inc    |    6 ---
 meta-oe/recipes-support/poppler/poppler_0.18.4.bb  |   10 ----
 .../poppler/{poppler.inc => poppler_0.22.3.bb}     |   13 ++++-
 23 files changed, 167 insertions(+), 128 deletions(-)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/browser_command.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/fix-format.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/glib-single-include.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/swap-colors.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview_0.1.8.bb (100%)
 create mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
 delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/configure-gthread.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
 delete mode 100644 meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb
 rename meta-oe/recipes-support/poppler/{poppler-data_0.4.5.bb => poppler-data_0.4.6.bb} (78%)
 delete mode 100644 meta-oe/recipes-support/poppler/poppler-fpu.inc
 delete mode 100644 meta-oe/recipes-support/poppler/poppler_0.18.4.bb
 rename meta-oe/recipes-support/poppler/{poppler.inc => poppler_0.22.3.bb} (65%)

-- 
1.7.4.4

[meta-oe/meta-gnome 01/15] libbonobo: fix build with glib 2.36

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../0001-Remove-use-of-G_DISABLE_DEPRECATED.patch  |   47 ++++++++++++++++++++
 .../recipes-gnome/bonobo/libbonobo_2.24.3.bb       |    3 +-
 2 files changed, 49 insertions(+), 1 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 0000000..44cf1f9
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,47 @@
+From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 2 May 2013 14:17:38 -0400
+Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This now trips up on GStaticRecMutex; I'm not going to bother to port,
+realistically no one is actively maintaining this code anymore.
+
+Upstream-Status: Applied
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ activation-server/Makefile.am |    1 -
+ configure.in                  |    2 +-
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am
+index efb18a8..ffa90f6 100644
+--- a/activation-server/Makefile.am
++++ b/activation-server/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES=					\
+ 	$(SERVER_CFLAGS)			\
+ 	$(WARN_CFLAGS)				\
+ 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
+ 	$(NULL)
+ 
+diff --git a/configure.in b/configure.in
+index 70a4e26..6be2bca 100644
+--- a/configure.in
++++ b/configure.in
+@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS)
+ AC_SUBST(SERVER_CFLAGS)
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+-	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
+ 	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ fi
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
index 253b46a..622f244 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
@@ -1,5 +1,6 @@
 require libbonobo.inc
-PR = "r1"
+PR = "r2"
 
+SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch"
 SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38"
 SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe"
-- 
1.7.4.4

[meta-oe/meta-gnome 02/15] libbonobo: remove unreferenced patch

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../bonobo/libbonobo/configure-gthread.patch       |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/configure-gthread.patch

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/configure-gthread.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/configure-gthread.patch
deleted file mode 100644
index 005fa67..0000000
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo/configure-gthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbonobo-2.14.0/configure.in.orig	2006-09-04 09:21:54.000000000 +0100
-+++ libbonobo-2.14.0/configure.in	2006-09-04 09:22:58.000000000 +0100
-@@ -166,7 +166,7 @@
- 		AC_MSG_RESULT(no)
- 		AC_MSG_ERROR(
- 			[No working gthread-2.0 support found, using --disable-threads IS DISCOURAGED])
--	]
-+	],[AC_MSG_RESULT(yes)]
-   )
-   CFLAGS=$libbonobo_save_CFLAGS
-   LIBS=$libbonobo_save_LIBS
-- 
1.7.4.4

[meta-oe/meta-gnome 03/15] gnome-vfs: fix build with glib 2.36

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...kefile.am-remove-DG_DISABLE_DEPRECATED-to.patch |   42 ++++++++++++++++++++
 .../recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb    |    9 +++-
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch

diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
new file mode 100644
index 0000000..d8f7e40
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
@@ -0,0 +1,42 @@
+From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 7 May 2013 14:56:06 +0200
+Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix
+ build with glib-2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ daemon/Makefile.am      |    1 -
+ libgnomevfs/Makefile.am |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index ca57467..040484f 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -8,7 +8,6 @@ INCLUDES= \
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+ 	-DGNOME_VFS_LIBDIR=\"$(libdir)\"	\
+diff --git a/libgnomevfs/Makefile.am b/libgnomevfs/Makefile.am
+index 69a02e0..5d7d759 100644
+--- a/libgnomevfs/Makefile.am
++++ b/libgnomevfs/Makefile.am
+@@ -19,7 +19,6 @@ INCLUDES =					\
+ 	-D_LARGEFILE64_SOURCE                   \
+ 	-D_POSIX_PTHREAD_SEMANTICS		\
+ 	-D_REENTRANT				\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DGNOME_VFS_PREFIX=\"$(prefix)\"	\
+ 	-DGNOME_VFS_BINDIR=\"$(bindir)\"	\
+ 	-DGNOME_VFS_DATADIR=\"$(datadir)\"	\
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 78cd1d6..57bbc13 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -13,15 +13,18 @@ DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
 
-SRC_URI += "file://gconftool-lossage.patch \
-        file://gnome-vfs-no-kerberos.patch;striplevel=0"
+SRC_URI += " \
+    file://gconftool-lossage.patch \
+    file://gnome-vfs-no-kerberos.patch;striplevel=0 \
+    file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
+"
 
 SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
 SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"
-- 
1.7.4.4

[meta-oe/meta-gnome 04/15] gnome-terminal: move out of nonworking

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch |    0
 .../gnome/gnome-terminal_2.26.3.bb                 |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-gnome/recipes-gnome/{nonworking => }/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch (100%)
 rename meta-gnome/recipes-gnome/{nonworking => }/gnome/gnome-terminal_2.26.3.bb (100%)

diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
rename to meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
similarity index 100%
rename from meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb
rename to meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
-- 
1.7.4.4

[meta-oe/meta-gnome 05/15] gnome-terminal: update to 2.30.2

[Andreas Müller]

this is the last version with GPL V2

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../0001-Makefile.am-do-not-build-help.patch       |   28 ++++++++++++++++++++
 .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch |   20 --------------
 .../recipes-gnome/gnome/gnome-terminal_2.26.3.bb   |   19 -------------
 .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb   |   15 ++++++++++
 4 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
 create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb

diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
new file mode 100644
index 0000000..d7874e4
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch
@@ -0,0 +1,28 @@
+From d2549d3ef08536be6d141524e3382fef07fea8bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 30 Apr 2013 19:48:27 +0200
+Subject: [PATCH] Makefile.am: do not build help
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 89f7ee4..31e11ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src po help
++SUBDIRS = src po
+ 
+ NULL =
+ 
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
deleted file mode 100644
index 0358ed8..0000000
--- a/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001
-From: Seán de Búrca <leftmostcat@gmail.com>
-Date: Fri, 07 Aug 2009 00:38:52 +0000
-Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
-
----
-diff --git a/help/el/el.po b/help/el/el.po
-index ab77264..635b68f 100644
---- a/help/el/el.po
-+++ b/help/el/el.po
-@@ -10,7 +10,6 @@ msgstr ""
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: 2\n"
- "X-Poedit-Language: Greek\n"
- "X-Poedit-Country: GREECE\n"
- "X-Generator: Lokalize 0.2\n"
---
-cgit v0.8.3.1
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
deleted file mode 100644
index 9bf6b6d..0000000
--- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "GNOME Terminal"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed"
-DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte"
-PR = "r2"
-
-inherit gnome
-
-SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-# Remove an autogenerated file that needs to be rebuilt
-do_configure_prepend () {
-    rm -f ${S}/src/terminal-type-builtins.c
-}
-
-SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8"
-SRC_URI[archive.sha256sum] = "ecddbf523700820524b2646451c307c5b55078b9cebe5fa464ef626b4b4cbda2"
diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
new file mode 100644
index 0000000..1afd334
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "GNOME Terminal"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed"
+DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte gnome-doc-utils"
+
+inherit gnome
+
+SRC_URI += " \
+    file://0001-Makefile.am-do-not-build-help.patch \
+"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+SRC_URI[archive.md5sum] = "74c4528f00067072c2bd867d1f8fe844"
+SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a"
-- 
1.7.4.4

[meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Andreas Müller]

warning was:

| configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/poppler/poppler.inc       |    1 -
 meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
index d0c0074..11286bc 100644
--- a/meta-oe/recipes-support/poppler/poppler.inc
+++ b/meta-oe/recipes-support/poppler/poppler.inc
@@ -11,7 +11,6 @@ EXTRA_OECONF = "\
     --enable-xpdf-headers \
     --disable-gtk-test \
     --disable-poppler-qt \
-    --disable-poppler-qt4 \
     --enable-zlib \
 "
 
diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
index 2f4927b..6a9dbbe 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
@@ -2,8 +2,6 @@ require poppler.inc
 
 DEPENDS += "lcms"
 
-EXTRA_OECONF_append = " --disable-abiword-output "
-
 RDEPENDS_${PN} = "poppler-data"
 
 SRC_URI[md5sum] = "12658f3308597e57f3faff538cc73baf"
-- 
1.7.4.4

[meta-oe/meta-gnome 07/15] poppler: merge include files into poppler - only poppler requires them

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/poppler/poppler-fpu.inc   |    6 ---
 meta-oe/recipes-support/poppler/poppler.inc       |   24 --------------
 meta-oe/recipes-support/poppler/poppler_0.18.4.bb |   36 ++++++++++++++++++---
 3 files changed, 31 insertions(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-support/poppler/poppler-fpu.inc
 delete mode 100644 meta-oe/recipes-support/poppler/poppler.inc

diff --git a/meta-oe/recipes-support/poppler/poppler-fpu.inc b/meta-oe/recipes-support/poppler/poppler-fpu.inc
deleted file mode 100644
index 67d97ca..0000000
--- a/meta-oe/recipes-support/poppler/poppler-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_poppler_fpu_setting(bb, d):
-    if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
-        return "--enable-fixedpoint"
-    return ""
-
diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
deleted file mode 100644
index 11286bc..0000000
--- a/meta-oe/recipes-support/poppler/poppler.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-    --enable-xpdf-headers \
-    --disable-gtk-test \
-    --disable-poppler-qt \
-    --enable-zlib \
-"
-
-# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require poppler-fpu.inc
-EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
-
-PACKAGES =+ "libpoppler libpoppler-glib"
-FILES_libpoppler = "${libdir}/libpoppler.so.*"
-FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
-
diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
index 6a9dbbe..df26c03 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
@@ -1,8 +1,34 @@
-require poppler.inc
-
-DEPENDS += "lcms"
-
-RDEPENDS_${PN} = "poppler-data"
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "12658f3308597e57f3faff538cc73baf"
 SRC_URI[sha256sum] = "33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e"
+
+DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+    --enable-xpdf-headers \
+    --disable-gtk-test \
+    --disable-poppler-qt \
+    --enable-zlib \
+"
+
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+def get_poppler_fpu_setting(bb, d):
+    if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
+        return "--enable-fixedpoint"
+    return ""
+
+EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
+
+PACKAGES =+ "libpoppler libpoppler-glib"
+FILES_libpoppler = "${libdir}/libpoppler.so.*"
+FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
+
+RDEPENDS_${PN} = "poppler-data"
-- 
1.7.4.4

[meta-oe/meta-gnome 08/15] poppler: update to 0.22.3

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{poppler_0.18.4.bb => poppler_0.22.3.bb}       |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/poppler/{poppler_0.18.4.bb => poppler_0.22.3.bb} (85%)

diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
similarity index 85%
rename from meta-oe/recipes-support/poppler/poppler_0.18.4.bb
rename to meta-oe/recipes-support/poppler/poppler_0.22.3.bb
index df26c03..660bc0e 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.22.3.bb
@@ -3,13 +3,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "12658f3308597e57f3faff538cc73baf"
-SRC_URI[sha256sum] = "33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e"
+SRC_URI[md5sum] = "be915388eaad6865cee5a156c8119ec1"
+SRC_URI[sha256sum] = "916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431"
 
 DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms"
 
-PR = "r1"
-
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "\
-- 
1.7.4.4

[meta-oe/meta-gnome 09/15] poppler-data: update to 0.4.6 and stylize a bit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...poppler-data_0.4.5.bb => poppler-data_0.4.6.bb} |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/poppler/{poppler-data_0.4.5.bb => poppler-data_0.4.6.bb} (78%)

diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.6.bb
similarity index 78%
rename from meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
rename to meta-oe/recipes-support/poppler/poppler-data_0.4.6.bb
index 56a30e4..cb502d4 100644
--- a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
+++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.6.bb
@@ -5,7 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \
                     file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \
 "
 
+inherit allarch
+
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "a8a7ca808827dd674faba6e4fc73b471"
+SRC_URI[sha256sum] = "f306901dfa5bda90cd6663d4eedb1c773c3c709de78018c79f1282b2c8f90afa"
 
 do_compile() {
 }
@@ -15,7 +19,3 @@ do_install() {
 }
 
 FILES_${PN} += "${datadir}"
-inherit allarch
-
-SRC_URI[md5sum] = "448dd7c5077570e340340706cef931aa"
-SRC_URI[sha256sum] = "3190bc457bafe4b158f79a08e8a3f1824031ec12acefc359e68e0f04da0f70fd"
-- 
1.7.4.4

[meta-oe/meta-gnome 10/15] epdfview: move to nonworking

[Andreas Müller]

* images are not displayed anymore
* there will be no further development / upstream is gone [1]

[1] https://bugzilla.redhat.com/show_bug.cgi?id=906121

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../epdfview/epdfview/browser_command.patch        |    0
 .../epdfview/epdfview/fix-format.patch             |    0
 .../epdfview/epdfview/glib-single-include.patch    |    0
 .../epdfview/epdfview/swap-colors.patch            |    0
 .../{ => nonworking}/epdfview/epdfview_0.1.8.bb    |    0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/browser_command.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/fix-format.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/glib-single-include.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview/swap-colors.patch (100%)
 rename meta-gnome/recipes-apps/{ => nonworking}/epdfview/epdfview_0.1.8.bb (100%)

diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/browser_command.patch
similarity index 100%
rename from meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch
rename to meta-gnome/recipes-apps/nonworking/epdfview/epdfview/browser_command.patch
diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/fix-format.patch
similarity index 100%
rename from meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch
rename to meta-gnome/recipes-apps/nonworking/epdfview/epdfview/fix-format.patch
diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/glib-single-include.patch
similarity index 100%
rename from meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch
rename to meta-gnome/recipes-apps/nonworking/epdfview/epdfview/glib-single-include.patch
diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview/swap-colors.patch
similarity index 100%
rename from meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch
rename to meta-gnome/recipes-apps/nonworking/epdfview/epdfview/swap-colors.patch
diff --git a/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb b/meta-gnome/recipes-apps/nonworking/epdfview/epdfview_0.1.8.bb
similarity index 100%
rename from meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb
rename to meta-gnome/recipes-apps/nonworking/epdfview/epdfview_0.1.8.bb
-- 
1.7.4.4

[meta-oe/meta-gnome 11/15] evince: fix/remove postinst by inheriting gsettings

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
index 986cd71..f1c3563 100644
--- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
 SECTION = "x11/office"
 DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
 
-PR = "r3"
+PR = "r4"
 
-inherit gnome pkgconfig gtk-icon-cache
+inherit gnome pkgconfig gtk-icon-cache gsettings
 
 SRC_URI += "file://cross-compile-fix.patch"
 
@@ -36,11 +36,3 @@ FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
 FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
                           ${libdir}/evince/*/backends/*.a"
 FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
-
-pkg_postinst_${PN} () {
-if [ -n "$D" ]; then
-    exit 1
-fi
-
-glib-compile-schemas ${datadir}/glib-2.0/schemas
-}
-- 
1.7.4.4

[meta-oe/meta-gnome 12/15] dconf: fix/remove postinst by inheriting gsettings

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
index ba14e88..7d11cf8 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SECTION = "x11/gnome"
 
-inherit gnome
+inherit gnome gsettings
 SRC_URI[archive.md5sum] = "d784f8afca04473d194a72047595c28e"
 SRC_URI[archive.sha256sum] = "e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33"
 
@@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 gtk+3"
 
 inherit vala
 
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "dconf-editor"
 
@@ -21,11 +21,3 @@ FILES_${PN} += "${datadir}/dbus-1/ \
                 ${libdir}/gio/modules/*.so \
 "
 FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
-
-pkg_postinst_${PN} () {
-if [ -n "$D" ]; then
-    exit 1
-fi
-
-glib-compile-schemas ${datadir}/glib-2.0/schemas
-}
-- 
1.7.4.4

[meta-oe/meta-gnome 13/15] proftpd: remove postinst - directory can be setup offline in do_install

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 28a7357..806413b 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
            file://make.patch \
@@ -47,6 +47,10 @@ do_install () {
 
     install -d ${D}${sysconfdir}/default
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd
+
+    # create the pub directory
+    mkdir -p ${D}/home/${FTPUSER}/pub/
+    chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub
 }
 
 INITSCRIPT_NAME = "proftpd"
@@ -55,13 +59,3 @@ INITSCRIPT_PARAM = "defaults 85 15"
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "${FTPGROUP}"
 USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
-
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ] ; then
-        exit 1
-    fi
-
-    # create the pub directory
-    mkdir -p /home/${FTPUSER}/pub/
-    chown -R ${FTPUSER}:${FTPGROUP} /home/${FTPUSER}/pub
-}
-- 
1.7.4.4

[meta-oe/meta-gnome 14/15] gnome-panel: let gconf.bblass take care for postinst

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gnome-panel/gnome-panel_2.32.1.bb              |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
index c4465a5..6abf73e 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SECTION = "x11/gnome"
 
-PR = "r6"
+PR = "r7"
 
 DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ pango libwnck gnome-menus cairo libgweather dbus-glib librsvg libcanberra" 
 
-inherit gtk-doc gnome gettext pkgconfig
+inherit gtk-doc gnome gettext pkgconfig gconf
 
 SRCREV = "6a364b6a4a9beed3da9ca6f5b0dac81eb99dea2a"
 SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32"
@@ -26,14 +26,6 @@ do_configure_prepend() {
     sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in
 }
 
-pkg_postinst_${PN}_append () {
-if [ -n "$D" ]; then
-    exit 1
-fi
-    gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \
-        --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries
-}
-
 PACKAGES =+ "libpanel-applet"
 FILES_libpanel-applet = "${libdir}/libpanel-applet-*.so.*"
 
@@ -43,5 +35,3 @@ FILES_${PN} =+ "${datadir}/gnome* \
                 ${datadir}/PolicyKit \
                 ${libdir}/bonobo \
 "
-
-
-- 
1.7.4.4

[meta-oe/meta-gnome 15/15] rp-pppoe: move chmod form postinst to offline do_install

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb     |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
index d4cc664..56246bc 100644
--- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://top-autoconf.patch \
@@ -29,6 +29,7 @@ do_install() {
     install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server
     # Install
     oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install
+    chmod 4755 ${D}${sbindir}/pppoe
 }
 
 # Insert server package before main package
@@ -41,13 +42,6 @@ FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \
 FILES_${PN}-relay = "${sbindir}/pppoe-relay"
 FILES_${PN}-sniff = "${sbindir}/pppoe-sniff"
 
-pkg_postinst_${PN} () {
-    if [ x"$D" != "x" ]; then
-        exit 1
-    fi
-    chmod 4755 ${sbindir}/pppoe
-}
-
 CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \
                    ${sysconfdir}/ppp/firewall-standalone \
                    ${sysconfdir}/ppp/firewall-masq"
-- 
1.7.4.4

Re: [meta-oe/meta-gnome 00/15] outstanding patches with fixes

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 08-05-13 00:41, Andreas Müller schreef:
> [01-03] further glib 2.36 [04-05] reanimate gnome-terminal [06-11]
> pdf-viewer [11-15] postinst improvements
> 
> The following changes since commit
> 8fec906a4584f9cbc467fb0e406bb6a705848b64:
> 
> smartmontools: import from OE classic (2013-05-07 18:59:01 +0200)
> 
> are available in the git repository at: 
> git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
> fixes-here-and-there
> 
> Andreas Müller (15): libbonobo: fix build with glib 2.36 libbonobo:
> remove unreferenced patch gnome-vfs: fix build with glib 2.36 
> gnome-terminal: move out of nonworking gnome-terminal: update to 2.30.2 
> poppler: remove unrecognized configure options poppler: merge include
> files into poppler - only poppler requires them poppler: update to
> 0.22.3 poppler-data: update to 0.4.6 and stylize a bit epdfview: move to
> nonworking evince: fix/remove postinst by inheriting gsettings dconf:
> fix/remove postinst by inheriting gsettings proftpd: remove postinst -
> directory can be setup offline in do_install gnome-panel: let
> gconf.bblass take care for postinst rp-pppoe: move chmod form postinst to
> offline do_install

These look good to me, can we also include them in the dylan branch?



-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFRii89MkyGM64RGpERAuFyAKCe3bShKqEFiMEMdMYwUtq9uQizzACfRa+j
y9qzIKPi0EQQlKRdazd1kMo=
=uHZj
-----END PGP SIGNATURE-----

Re: [meta-oe/meta-gnome 00/15] outstanding patches with fixes

[Eric Bénard]

Le Wed, 08 May 2013 12:55:57 +0200,
Koen Kooi <koen@dominion.thruhere.net> a écrit :

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Op 08-05-13 00:41, Andreas Müller schreef:
> > [01-03] further glib 2.36 [04-05] reanimate gnome-terminal [06-11]
> > pdf-viewer [11-15] postinst improvements
> > 
> > The following changes since commit
> > 8fec906a4584f9cbc467fb0e406bb6a705848b64:
> > 
> > smartmontools: import from OE classic (2013-05-07 18:59:01 +0200)
> > 
> > are available in the git repository at: 
> > git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
> > fixes-here-and-there
> > 
> > Andreas Müller (15): libbonobo: fix build with glib 2.36 libbonobo:
> > remove unreferenced patch gnome-vfs: fix build with glib 2.36 
> > gnome-terminal: move out of nonworking gnome-terminal: update to 2.30.2 
> > poppler: remove unrecognized configure options poppler: merge include
> > files into poppler - only poppler requires them poppler: update to
> > 0.22.3 poppler-data: update to 0.4.6 and stylize a bit epdfview: move to
> > nonworking evince: fix/remove postinst by inheriting gsettings dconf:
> > fix/remove postinst by inheriting gsettings proftpd: remove postinst -
> > directory can be setup offline in do_install gnome-panel: let
> > gconf.bblass take care for postinst rp-pppoe: move chmod form postinst to
> > offline do_install
> 
> These look good to me, can we also include them in the dylan branch?
> 
yes, that will be done.

Eric

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Andreas Oberritter]

On 08.05.2013 00:41, Andreas Müller wrote:
> warning was:
> 
> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
>  2 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
> index d0c0074..11286bc 100644
> --- a/meta-oe/recipes-support/poppler/poppler.inc
> +++ b/meta-oe/recipes-support/poppler/poppler.inc
> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
>      --enable-xpdf-headers \
>      --disable-gtk-test \
>      --disable-poppler-qt \
> -    --disable-poppler-qt4 \
>      --enable-zlib \
>  "

This hunk doesn't match the cited warning.

Regards,
Andreas

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Andreas Müller]

On Fri, May 10, 2013 at 12:30 PM, Andreas Oberritter
<obi@opendreambox.org> wrote:
> On 08.05.2013 00:41, Andreas Müller wrote:
>> warning was:
>>
>> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
>>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
>>  2 files changed, 0 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
>> index d0c0074..11286bc 100644
>> --- a/meta-oe/recipes-support/poppler/poppler.inc
>> +++ b/meta-oe/recipes-support/poppler/poppler.inc
>> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
>>      --enable-xpdf-headers \
>>      --disable-gtk-test \
>>      --disable-poppler-qt \
>> -    --disable-poppler-qt4 \
>>      --enable-zlib \
>>  "
>
> This hunk doesn't match the cited warning.
>
> Regards,
> Andreas
Oops - will send a correcting patch.

Andreas

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2187 bytes --]

On Fri, May 10, 2013 at 07:03:40PM +0200, Andreas Müller wrote:
> On Fri, May 10, 2013 at 12:30 PM, Andreas Oberritter
> <obi@opendreambox.org> wrote:
> > On 08.05.2013 00:41, Andreas Müller wrote:
> >> warning was:
> >>
> >> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
> >>
> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> ---
> >>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
> >>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
> >>  2 files changed, 0 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
> >> index d0c0074..11286bc 100644
> >> --- a/meta-oe/recipes-support/poppler/poppler.inc
> >> +++ b/meta-oe/recipes-support/poppler/poppler.inc
> >> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
> >>      --enable-xpdf-headers \
> >>      --disable-gtk-test \
> >>      --disable-poppler-qt \
> >> -    --disable-poppler-qt4 \
> >>      --enable-zlib \
> >>  "
> >
> > This hunk doesn't match the cited warning.
> >
> > Regards,
> > Andreas
> Oops - will send a correcting patch.

I've also noticed that newer poppler fails to build on some
architectures (I know, too late, it was building fine on qemu* on
jenkins, but om-gta02 - armv4t fails with:

| Splash.cc: In member function 'void Splash::drawAALine(SplashPipe*, int, int, int)':
| Splash.cc:1497:19: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
|        pipe->shape = aaGamma[t];
|                    ^
| Splash.cc:1497:30: note: candidates are:
|        pipe->shape = aaGamma[t];
|                               ^
| In file included from SplashMath.h:27:0,
|                  from Splash.cc:44:
| ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
|    operator int()
|    ^
| ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
|    operator double()
|    ^
| ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
|    operator float()
|    ^

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Andreas Müller]

On Fri, May 10, 2013 at 7:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, May 10, 2013 at 07:03:40PM +0200, Andreas Müller wrote:
>> On Fri, May 10, 2013 at 12:30 PM, Andreas Oberritter
>> <obi@opendreambox.org> wrote:
>> > On 08.05.2013 00:41, Andreas Müller wrote:
>> >> warning was:
>> >>
>> >> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
>> >>
>> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> >> ---
>> >>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
>> >>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
>> >>  2 files changed, 0 insertions(+), 3 deletions(-)
>> >>
>> >> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
>> >> index d0c0074..11286bc 100644
>> >> --- a/meta-oe/recipes-support/poppler/poppler.inc
>> >> +++ b/meta-oe/recipes-support/poppler/poppler.inc
>> >> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
>> >>      --enable-xpdf-headers \
>> >>      --disable-gtk-test \
>> >>      --disable-poppler-qt \
>> >> -    --disable-poppler-qt4 \
>> >>      --enable-zlib \
>> >>  "
>> >
>> > This hunk doesn't match the cited warning.
>> >
>> > Regards,
>> > Andreas
>> Oops - will send a correcting patch.
>
> I've also noticed that newer poppler fails to build on some
> architectures (I know, too late, it was building fine on qemu* on
> jenkins, but om-gta02 - armv4t fails with:
>
> | Splash.cc: In member function 'void Splash::drawAALine(SplashPipe*, int, int, int)':
> | Splash.cc:1497:19: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
> |        pipe->shape = aaGamma[t];
> |                    ^
> | Splash.cc:1497:30: note: candidates are:
> |        pipe->shape = aaGamma[t];
> |                               ^
> | In file included from SplashMath.h:27:0,
> |                  from Splash.cc:44:
> | ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
> |    operator int()
> |    ^
> | ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
> |    operator double()
> |    ^
> | ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
> |    operator float()
> |    ^
>
> --
Can you send me log.do_configure for this?

Andreas

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2688 bytes --]

On Sun, May 12, 2013 at 12:35:49PM +0200, Andreas Müller wrote:
> On Fri, May 10, 2013 at 7:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Fri, May 10, 2013 at 07:03:40PM +0200, Andreas Müller wrote:
> >> On Fri, May 10, 2013 at 12:30 PM, Andreas Oberritter
> >> <obi@opendreambox.org> wrote:
> >> > On 08.05.2013 00:41, Andreas Müller wrote:
> >> >> warning was:
> >> >>
> >> >> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
> >> >>
> >> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> >> ---
> >> >>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
> >> >>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
> >> >>  2 files changed, 0 insertions(+), 3 deletions(-)
> >> >>
> >> >> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
> >> >> index d0c0074..11286bc 100644
> >> >> --- a/meta-oe/recipes-support/poppler/poppler.inc
> >> >> +++ b/meta-oe/recipes-support/poppler/poppler.inc
> >> >> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
> >> >>      --enable-xpdf-headers \
> >> >>      --disable-gtk-test \
> >> >>      --disable-poppler-qt \
> >> >> -    --disable-poppler-qt4 \
> >> >>      --enable-zlib \
> >> >>  "
> >> >
> >> > This hunk doesn't match the cited warning.
> >> >
> >> > Regards,
> >> > Andreas
> >> Oops - will send a correcting patch.
> >
> > I've also noticed that newer poppler fails to build on some
> > architectures (I know, too late, it was building fine on qemu* on
> > jenkins, but om-gta02 - armv4t fails with:
> >
> > | Splash.cc: In member function 'void Splash::drawAALine(SplashPipe*, int, int, int)':
> > | Splash.cc:1497:19: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
> > |        pipe->shape = aaGamma[t];
> > |                    ^
> > | Splash.cc:1497:30: note: candidates are:
> > |        pipe->shape = aaGamma[t];
> > |                               ^
> > | In file included from SplashMath.h:27:0,
> > |                  from Splash.cc:44:
> > | ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
> > |    operator int()
> > |    ^
> > | ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
> > |    operator double()
> > |    ^
> > | ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
> > |    operator float()
> > |    ^
> >
> > --
> Can you send me log.do_configure for this?

Sorry for late reply, but your patch "poppler: fix build for soft FPU
machines" fixed that already, thanks!

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe/meta-gnome 06/15] poppler: remove unrecognized configure options

[Andreas Müller]

On Tue, May 14, 2013 at 6:10 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sun, May 12, 2013 at 12:35:49PM +0200, Andreas Müller wrote:
>> On Fri, May 10, 2013 at 7:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Fri, May 10, 2013 at 07:03:40PM +0200, Andreas Müller wrote:
>> >> On Fri, May 10, 2013 at 12:30 PM, Andreas Oberritter
>> >> <obi@opendreambox.org> wrote:
>> >> > On 08.05.2013 00:41, Andreas Müller wrote:
>> >> >> warning was:
>> >> >>
>> >> >> | configure: WARNING: unrecognized options: --disable-poppler-qt, --disable-abiword-output
>> >> >>
>> >> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> >> >> ---
>> >> >>  meta-oe/recipes-support/poppler/poppler.inc       |    1 -
>> >> >>  meta-oe/recipes-support/poppler/poppler_0.18.4.bb |    2 --
>> >> >>  2 files changed, 0 insertions(+), 3 deletions(-)
>> >> >>
>> >> >> diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
>> >> >> index d0c0074..11286bc 100644
>> >> >> --- a/meta-oe/recipes-support/poppler/poppler.inc
>> >> >> +++ b/meta-oe/recipes-support/poppler/poppler.inc
>> >> >> @@ -11,7 +11,6 @@ EXTRA_OECONF = "\
>> >> >>      --enable-xpdf-headers \
>> >> >>      --disable-gtk-test \
>> >> >>      --disable-poppler-qt \
>> >> >> -    --disable-poppler-qt4 \
>> >> >>      --enable-zlib \
>> >> >>  "
>> >> >
>> >> > This hunk doesn't match the cited warning.
>> >> >
>> >> > Regards,
>> >> > Andreas
>> >> Oops - will send a correcting patch.
>> >
>> > I've also noticed that newer poppler fails to build on some
>> > architectures (I know, too late, it was building fine on qemu* on
>> > jenkins, but om-gta02 - armv4t fails with:
>> >
>> > | Splash.cc: In member function 'void Splash::drawAALine(SplashPipe*, int, int, int)':
>> > | Splash.cc:1497:19: error: conversion from 'SplashCoord {aka FixedPoint}' to 'Guchar {aka unsigned char}' is ambiguous
>> > |        pipe->shape = aaGamma[t];
>> > |                    ^
>> > | Splash.cc:1497:30: note: candidates are:
>> > |        pipe->shape = aaGamma[t];
>> > |                               ^
>> > | In file included from SplashMath.h:27:0,
>> > |                  from Splash.cc:44:
>> > | ../goo/FixedPoint.h:45:3: note: FixedPoint::operator int()
>> > |    operator int()
>> > |    ^
>> > | ../goo/FixedPoint.h:43:3: note: FixedPoint::operator double()
>> > |    operator double()
>> > |    ^
>> > | ../goo/FixedPoint.h:41:3: note: FixedPoint::operator float()
>> > |    operator float()
>> > |    ^
>> >
>> > --
>> Can you send me log.do_configure for this?
>
> Sorry for late reply, but your patch "poppler: fix build for soft FPU
> machines" fixed that already, thanks!
>
No problem - a built for om-gta02 overnight showed the error situation.

Andreas