diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2007-07-23 18:56:12 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2007-07-23 18:56:12 +0000 |
commit | 83c5e0065b66751e28bbf36f596dfc2f462a7cc8 (patch) | |
tree | b2ebf80f42199611227e2608e5f1fdc16bae845c | |
parent | Bunch of new stuff, all related around gnome-main-menu (once called slab). li... (diff) | |
download | suka-83c5e0065b66751e28bbf36f596dfc2f462a7cc8.tar.gz suka-83c5e0065b66751e28bbf36f596dfc2f462a7cc8.tar.bz2 suka-83c5e0065b66751e28bbf36f596dfc2f462a7cc8.zip |
Add intlclock-patch to gnome-panel. This provides an alternate clock applet with multiple time zone display on a worldmap (taken from
SLED SP1)
svn path=/; revision=5
-rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-intlclock.patch | 103 | ||||
-rw-r--r-- | gnome-base/gnome-panel/files/intlclock-applet.tar.bz2 | bin | 0 -> 165860 bytes | |||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.19.5.ebuild | 8 | ||||
-rw-r--r-- | profiles/package.mask | 11 | ||||
-rw-r--r-- | profiles/repo_name | 1 | ||||
-rw-r--r-- | profiles/use.local.desc | 4 |
6 files changed, 126 insertions, 1 deletions
diff --git a/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch b/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch new file mode 100644 index 0000000..2a89177 --- /dev/null +++ b/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch @@ -0,0 +1,103 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 10212) ++++ configure.in (working copy) +@@ -64,6 +64,7 @@ + LIBEDATASERVERUI_REQUIRED=1.2.0 + CAIRO_REQUIRED=1.0.0 + DBUS_GLIB_REQUIRED=0.60 ++LIBRSVG_REQUIRED=2.12.0 + + dnl pkg-config dependency checks + +@@ -108,6 +108,8 @@ + fi + AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT") + AC_SUBST(CLOCK_EDS_ICONDIR) ++ ++AC_SUBST(LIBRSVG_REQUIRED) + + PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED) + AC_SUBST(CLOCK_CFLAGS) +@@ -124,6 +126,20 @@ PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK + AC_SUBST(FISH_CFLAGS) + AC_SUBST(FISH_LIBS) + ++PKG_CHECK_MODULES(INTLCLOCK, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED $LIBECAL_REQUIREMENT) ++AC_SUBST(INTLCLOCK_CFLAGS) ++AC_SUBST(INTLCLOCK_LIBS) ++ ++# Check for system zone.tab file for intlclock ++AC_ARG_WITH([system-zonetab], ++ AC_HELP_STRING([--with-system-zoneinfo=DIR], ++ [Path to system zoneinfo directory]), ++ [SYSTEM_ZONEINFODIR=$withval], ++ [AC_PATH_PROG(SYSTEM_ZONEINFODIR, zone.tab, [/usr/share/zoneinfo/zone.tab], [/usr/share/zoneinfo/zone.tab:/usr/local/share/zoneinfo/zone.tab])]) ++if echo $SYSTEM_ZONEINFODIR |grep "/zone.tab$" >/dev/null 2>&1; then ++ SYSTEM_ZONEINFODIR=`dirname $SYSTEM_ZONEINFODIR` ++fi ++ + # For the run dialog + gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE + +@@ -228,6 +244,7 @@ po/Makefile.in + applets/Makefile + applets/clock/Makefile + applets/fish/Makefile ++applets/intlclock/Makefile + applets/notification_area/Makefile + applets/wncklet/Makefile + doc/Makefile +Index: applets/Makefile.am +=================================================================== +--- applets/Makefile.am (revision 10212) ++++ applets/Makefile.am (working copy) +@@ -1,6 +1,7 @@ + SUBDIRS = \ + clock \ + fish \ ++ intlclock \ + notification_area \ + wncklet + +Index: applets/clock/GNOME_ClockApplet_Factory.server.in.in +=================================================================== +--- applets/clock/GNOME_ClockApplet_Factory.server.in.in (revision 10212) ++++ applets/clock/GNOME_ClockApplet_Factory.server.in.in (working copy) +@@ -13,7 +13,7 @@ + + </oaf_server> + +-<oaf_server iid="OAFIID:GNOME_ClockApplet" ++<oaf_server iid="OAFIID:GNOME_ClassicClockApplet" + type="factory" + location="OAFIID:GNOME_ClockApplet_Factory"> + +Index: applets/clock/clock.c +=================================================================== +--- applets/clock/clock.c (revision 10212) ++++ applets/clock/clock.c (working copy) +@@ -2756,7 +2756,7 @@ clock_factory (PanelApplet *applet, + { + gboolean retval = FALSE; + +- if (!strcmp (iid, "OAFIID:GNOME_ClockApplet")) ++ if (!strcmp (iid, "OAFIID:GNOME_ClassicClockApplet")) + retval = fill_clock_applet (applet); + + return retval; +Index: po/POTFILES.in +=================================================================== +--- po/POTFILES.in (revision 10212) ++++ po/POTFILES.in (working copy) +@@ -11,6 +11,10 @@ applets/fish/GNOME_FishApplet_Factory.se + applets/fish/fish.c + applets/fish/fish.glade + applets/fish/fish.schemas.in ++applets/intlclock/intlclock.c ++applets/intlclock/intlclock.glade ++applets/intlclock/intlclock-location-tile.c ++applets/intlclock/intlclock-ui.c + applets/notification_area/GNOME_NotificationAreaApplet.server.in.in + applets/notification_area/GNOME_NotificationAreaApplet.xml + applets/notification_area/eggtraymanager.c diff --git a/gnome-base/gnome-panel/files/intlclock-applet.tar.bz2 b/gnome-base/gnome-panel/files/intlclock-applet.tar.bz2 Binary files differnew file mode 100644 index 0000000..a704895 --- /dev/null +++ b/gnome-base/gnome-panel/files/intlclock-applet.tar.bz2 diff --git a/gnome-base/gnome-panel/gnome-panel-2.19.5.ebuild b/gnome-base/gnome-panel/gnome-panel-2.19.5.ebuild index 31dd69f..5f6fde1 100644 --- a/gnome-base/gnome-panel/gnome-panel-2.19.5.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-2.19.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 FDL-1.1 LGPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc eds" +IUSE="doc eds intlclock" RDEPEND=">=gnome-base/gnome-desktop-2.12 >=dev-libs/glib-2.13.0 @@ -55,6 +55,12 @@ src_unpack() { epatch ${FILESDIR}/${PN}-recently-used-apps.patch epatch ${FILESDIR}/${PN}-2.19.5-libemap-pic.patch + + if use intlclock; then + cd ${S} + tar -xjf ${FILESDIR}/intlclock-applet.tar.bz2 || die + epatch ${FILESDIR}/${PN}-intlclock.patch + fi eautomake } diff --git a/profiles/package.mask b/profiles/package.mask new file mode 100644 index 0000000..3a3bd1f --- /dev/null +++ b/profiles/package.mask @@ -0,0 +1,11 @@ +#################################################################### +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.6869 2007/02/26 09:10:56 opfer Exp $ +# When you add an entry to this file, add your name, the date, and an +# explanation of why something is getting masked +# +# NOTE: Please add your entry at the top! +# + +# This is really only meant in combination with the gnome-experimental overlay +>=gnome-base/gnome-desktop-2.19.5 +>=gnome-base/gnome-panel-2.19.5 diff --git a/profiles/repo_name b/profiles/repo_name new file mode 100644 index 0000000..9e38275 --- /dev/null +++ b/profiles/repo_name @@ -0,0 +1 @@ +suka's dev overlay - experimental stuff of all sorts
\ No newline at end of file diff --git a/profiles/use.local.desc b/profiles/use.local.desc new file mode 100644 index 0000000..aaf63dc --- /dev/null +++ b/profiles/use.local.desc @@ -0,0 +1,4 @@ + +gnome-extra/gnome-main-menu:nautilus - enable nautilus extension +gnome-extra/gnome-main-menu:libssui - integrate alternate libssui logout and shutdown dialogs +gnome-base/gnome-panel:intlclock - Add international clock with worldmap to appet list
\ No newline at end of file |