diff options
| -rw-r--r-- | xfce-base/xfce4-panel/ChangeLog | 9 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch | 23 | ||||
| -rw-r--r-- | xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild | 40 |
3 files changed, 71 insertions, 1 deletions
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog index 6d80cfdd5f4f..d5f31562820d 100644 --- a/xfce-base/xfce4-panel/ChangeLog +++ b/xfce-base/xfce4-panel/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-base/xfce4-panel # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.153 2010/03/11 21:10:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.154 2010/03/20 11:33:35 ssuominen Exp $ + +*xfce4-panel-4.6.2-r1 (20 Mar 2010) + + 20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + +xfce4-panel-4.6.2-r1.ebuild, +files/xfce4-panel-4.6.2-glib-2.23.patch: + Fix glib >= 2.23 compability wrt #308569, thanks to Michal Kurgan and + David Heavens. 11 Mar 2010; Brent Baude <ranger@gentoo.org> xfce4-panel-4.6.2.ebuild: Marking xfce4-panel-4.6.2 ppc64 stable for bug 305657 diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch new file mode 100644 index 000000000000..b4047f87a93b --- /dev/null +++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.6.2-glib-2.23.patch @@ -0,0 +1,23 @@ +diff --git a/libxfce4panel/xfce-panel-window.c b/libxfce4panel/xfce-panel-window.c +index 7d0687b..6a6ecd8 100644 +--- a/libxfce4panel/xfce-panel-window.c ++++ b/libxfce4panel/xfce-panel-window.c +@@ -304,14 +304,10 @@ xfce_panel_window_init (XfcePanelWindow *panel_window) + + GTK_WIDGET_SET_FLAGS (GTK_WIDGET (panel_window), GTK_CAN_FOCUS); + +- g_object_set (G_OBJECT (panel_window), +- "type", GTK_WINDOW_TOPLEVEL, +- "decorated", FALSE, +- "resizable", FALSE, +- "type-hint", GDK_WINDOW_TYPE_HINT_DOCK, +- "title", PACKAGE_NAME " " PACKAGE_VERSION, +- NULL); +- ++ gtk_window_set_type_hint (GTK_WINDOW (panel_window), GDK_WINDOW_TYPE_HINT_DOCK); ++ gtk_window_set_decorated (GTK_WINDOW (panel_window), FALSE); ++ gtk_window_set_resizable (GTK_WINDOW (panel_window), FALSE); ++ gtk_window_set_title (GTK_WINDOW (panel_window), PACKAGE_NAME); + gtk_window_stick (GTK_WINDOW (panel_window)); + + priv = XFCE_PANEL_WINDOW_GET_PRIVATE (panel_window); diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild new file mode 100644 index 000000000000..494e87d82438 --- /dev/null +++ b/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.6.2-r1.ebuild,v 1.1 2010/03/20 11:33:35 ssuominen Exp $ + +EAPI=2 +EAUTORECONF=yes +inherit xfconf + +DESCRIPTION="Panel for Xfce4" +HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/" +SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="debug startup-notification" + +RDEPEND=">=dev-libs/glib-2.20:2 + x11-libs/cairo + x11-libs/libX11 + x11-libs/libSM + >=x11-libs/gtk+-2.12:2 + >=x11-libs/libwnck-2.12 + >=xfce-base/libxfce4util-4.6 + >=xfce-base/libxfcegui4-4.6 + >=xfce-base/exo-0.3.100 + startup-notification? ( x11-libs/startup-notification )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + XFCONF="--disable-dependency-tracking + $(use_enable startup-notification) + $(use_enable debug)" + DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + PATCHES=( "${FILESDIR}/${P}-exo.patch" + "${FILESDIR}/${P}-glib-2.23.patch" ) +} |