diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-i18n/libtomoe-gtk | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-i18n/libtomoe-gtk')
-rw-r--r-- | app-i18n/libtomoe-gtk/Manifest | 1 | ||||
-rw-r--r-- | app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-gucharmap2.patch | 253 | ||||
-rw-r--r-- | app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch | 15 | ||||
-rw-r--r-- | app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild | 71 | ||||
-rw-r--r-- | app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild | 76 | ||||
-rw-r--r-- | app-i18n/libtomoe-gtk/metadata.xml | 11 |
6 files changed, 427 insertions, 0 deletions
diff --git a/app-i18n/libtomoe-gtk/Manifest b/app-i18n/libtomoe-gtk/Manifest new file mode 100644 index 000000000000..0b831f9df0ea --- /dev/null +++ b/app-i18n/libtomoe-gtk/Manifest @@ -0,0 +1 @@ +DIST tomoe-gtk-0.6.0.tar.gz 448058 SHA256 4e9b228e25451b1e875127a57eb40270e38c59cf4d46bc25c208e370d884ba64 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43 WHIRLPOOL e17ed0cde3af6b355d91f4e44dc73d630dff0e4bb08b1fd7acb36410773957a32f116d798d8a436df70513f336f173a1313ab5172c3d4dd110eff6e50eeebf7a diff --git a/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-gucharmap2.patch b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-gucharmap2.patch new file mode 100644 index 000000000000..44900beb6784 --- /dev/null +++ b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-gucharmap2.patch @@ -0,0 +1,253 @@ +--- + Update libtomoe-gtk to gucharmap-2 API + https://bugs.gentoo.org/show_bug.cgi?id=243160 + + Makefile.am | 1 + bindings/python/Makefile.am | 5 ++- + configure.ac | 14 +++++--- + src/tomoe-gucharmap.c | 71 +++++++++++++++++++++++++++++++++++++++----- + 4 files changed, 78 insertions(+), 13 deletions(-) + +--- a/Makefile.am 2007-06-07 14:36:06.000000000 +0900 ++++ b/Makefile.am 2008-12-21 01:24:06.000000000 +0900 +@@ -1,3 +1,4 @@ ++ACLOCAL_AMFLAGS = -I macros + SUBDIRS=src data po test doc bindings + + EXTRA_DIST = autogen.sh tomoe-gtk.pc +--- a/configure.ac 2007-06-12 17:17:23.000000000 +0900 ++++ b/configure.ac 2008-12-21 01:08:16.000000000 +0900 +@@ -94,6 +94,9 @@ + AC_SUBST(TOMOE_CFLAGS) + AC_SUBST(TOMOE_LIBS) + ++TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0" ++AC_SUBST(TOMOE_GTK_REQUIRED_LIBS) ++ + # Checks for gucharmap + AC_ARG_WITH(gucharmap, + AS_HELP_STRING([--with-gucharmap], +@@ -102,14 +105,15 @@ + [use_gucharmap=yes]) + if test x"$use_gucharmap" = "xyes"; then + # Checks for gucharmap +- PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0]) +- TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap >= 1.4.0" +-else +- TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0" ++ PKG_CHECK_EXISTS(gucharmap-2, ++ [PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2], ++ [gucharmap_lib="gucharmap-2"])], ++ [PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], ++ [gucharmap_lib="gucharmap >= 1.4.0"])]) ++ TOMOE_GTK_REQUIRED_LIBS="$TOMOE_GTK_REQUIRED_LIBS $gucharmap_lib" + fi + AC_SUBST(GUCHARMAP_CFLAGS) + AC_SUBST(GUCHARMAP_LIBS) +-AC_SUBST(TOMOE_GTK_REQUIRED_LIBS) + AM_CONDITIONAL([USE_GUCHARMAP], [test x"$use_gucharmap" = "xyes"]) + + # Check for pygtk +--- a/src/tomoe-gucharmap.c 2007-04-27 14:41:40.000000000 +0900 ++++ b/src/tomoe-gucharmap.c 2008-12-21 01:08:16.000000000 +0900 +@@ -34,7 +34,11 @@ + { + GtkWidget *chapters_type_combobox; + GtkWidget *chapters_combobox; ++#ifdef GUCHARMAP_TYPE_CHAPTERS + GucharmapChapters *chapters; ++#else ++ GucharmapChaptersModel *chapters_model; ++#endif + GucharmapCharmap *charmap; + gchar *selected; + }; +@@ -120,14 +124,24 @@ + gtk_widget_show (combobox); + + /* gucharmap */ ++#ifdef GUCHARMAP_TYPE_CHAPTERS + priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()); + priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new (priv->chapters)); ++#else ++ priv->chapters_model = gucharmap_block_chapters_model_new (); ++ priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new ()); ++ gucharmap_charmap_set_chapters_model (priv->charmap, priv->chapters_model); ++#endif + widget = GTK_WIDGET (priv->charmap); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 2); + gtk_widget_show (widget); + + /* Hide chapters page by default. Usually use combo box instead. */ ++#ifdef GUCHARMAP_TYPE_CHAPTERS + gtk_widget_hide (GTK_WIDGET (priv->chapters)); ++#else ++ gucharmap_charmap_set_chapters_visible (priv->charmap, FALSE); ++#endif + + #if 0 + /* CharDetails view will be here */ +@@ -146,10 +160,11 @@ + g_signal_connect (G_OBJECT (priv->chapters_combobox), "changed", + G_CALLBACK (on_chapters_combo_changed), + (gpointer) page); +- g_signal_connect (G_OBJECT (priv->charmap->chartable), "activate", ++ g_signal_connect (G_OBJECT (gucharmap_charmap_get_chartable (priv->charmap)), ++ "activate", + G_CALLBACK (on_gucharmap_activate), + (gpointer) page); +- g_signal_connect (G_OBJECT (priv->charmap->chartable), ++ g_signal_connect (G_OBJECT (gucharmap_charmap_get_chartable (priv->charmap)), + "button-release-event", + G_CALLBACK (on_gucharmap_button_release), + (gpointer) page); +@@ -162,7 +177,11 @@ + + priv->chapters_type_combobox = NULL; + priv->chapters_combobox = NULL; ++#ifdef GUCHARMAP_TYPE_CHAPTERS + priv->chapters = NULL; ++#else ++ priv->chapters_model = NULL; ++#endif + priv->charmap = NULL; + if (priv->selected) { + g_free (priv->selected); +@@ -188,7 +207,11 @@ + tomoe_gucharmap_get_selected_char (TomoeGucharmap *page) + { + TomoeGucharmapPrivate *priv; ++#ifdef GUCHARMAP_TABLE + GucharmapTable *table; ++#else ++ GucharmapChartable *table; ++#endif + gunichar c; + gchar buf[7]; + gint bytes; +@@ -196,9 +219,17 @@ + g_return_val_if_fail (TOMOE_IS_GUCHARMAP (page), NULL); + + priv = TOMOE_GUCHARMAP_GET_PRIVATE (page); ++#ifdef GUCHARMAP_TABLE + table = GUCHARMAP_TABLE (priv->charmap->chartable); ++#else ++ table = gucharmap_charmap_get_chartable (priv->charmap); ++#endif + ++#ifdef GUCHARMAP_TABLE + c = gucharmap_table_get_active_character (table); ++#else ++ c = gucharmap_chartable_get_active_character (table); ++#endif + bytes = g_unichar_to_utf8(c, buf); + + if (bytes > 0 && bytes < 7) { +@@ -222,7 +253,13 @@ + setup_chapters_combo_box (TomoeGucharmap *page) + { + TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page); +- GtkTreeModel *model = priv->chapters->tree_model; ++ GtkTreeModel *model; ++ ++#ifdef GUCHARMAP_TYPE_CHAPTERS ++ model = priv->chapters->tree_model; ++#else ++ model = GTK_TREE_MODEL (priv->chapters_model); ++#endif + + gtk_combo_box_set_model (GTK_COMBO_BOX (priv->chapters_combobox), model); + gtk_combo_box_set_active (GTK_COMBO_BOX (priv->chapters_combobox), 0); +@@ -235,12 +272,26 @@ + TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page); + gint idx = gtk_combo_box_get_active (combobox); + +- if (idx == 1) ++ if (idx == 1) { ++#ifdef GUCHARMAP_TYPE_CHAPTERS + priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ()); +- else ++#else ++ priv->chapters_model = gucharmap_script_chapters_model_new (); ++#endif ++ } else { ++#ifdef GUCHARMAP_TYPE_CHAPTERS + priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()); ++#else ++ priv->chapters_model = gucharmap_block_chapters_model_new (); ++#endif ++ } ++#ifdef GUCHARMAP_TYPE_CHAPTERS + gucharmap_charmap_set_chapters (priv->charmap, priv->chapters); + gtk_widget_hide (GTK_WIDGET (priv->chapters)); ++#else ++ gucharmap_charmap_set_chapters_model (priv->charmap, priv->chapters_model); ++ gucharmap_charmap_set_chapters_visible (priv->charmap, FALSE); ++#endif + setup_chapters_combo_box (page); + } + +@@ -249,6 +300,7 @@ + { + TomoeGucharmap *page = data; + TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page); ++ GtkTreeView *tree_view; + GtkTreePath *path; + gchar buf[8]; + gint idx; +@@ -256,8 +308,13 @@ + idx = gtk_combo_box_get_active (combobox); + g_snprintf (buf, 8 , "%d", idx); + path = gtk_tree_path_new_from_string (buf); +- gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->chapters->tree_view), +- path, NULL, FALSE); ++#ifdef GUCHARMAP_TYPE_CHAPTERS ++ tree_view = GTK_TREE_VIEW (priv->chapters->tree_view); ++#else ++ tree_view = ++ GTK_TREE_VIEW (gucharmap_charmap_get_chapters_view (priv->charmap)); ++#endif ++ gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); + gtk_tree_path_free (path); + } + +--- a/bindings/python/Makefile.am ++++ b/bindings/python/Makefile.am +@@ -6,6 +6,7 @@ + $(PYTHON_CFLAGS) \ + $(PYGOBJECT_CFLAGS) \ + $(PYGTK_CFLAGS) \ ++ $(GUCHARMAP_CFLAGS) \ + $(GTK2_CFLAGS) \ + $(TOMOE_CFLAGS) \ + -I$(top_srcdir)/src \ +@@ -21,11 +22,13 @@ + -module \ + -avoid-version \ + $(TOMOE_LDFLAGS) \ +- $(PYTHON_LDFLAGS) ++ $(PYTHON_LDFLAGS) \ ++ $(GUCHARMAP_LDFLAGS) + + tomoegtk_la_LIBADD = \ + $(TOMOE_LIBS) \ + $(PYGTK_LIBS) \ ++ $(GUCHARMAP_LIBS) \ + $(top_builddir)/src/libtomoe-gtk.la + + OVERRIDES = \ +--- a/doc/reference/Makefile.am 2009-03-09 23:53:04.000000000 +0100 ++++ b/doc/reference/Makefile.am 2009-03-09 23:52:30.000000000 +0100 +@@ -27,10 +27,12 @@ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + $(TOMOE_CFLAGS) \ ++ $(GUCHARMAP_CFLAGS) \ + $(GTK2_CFLAGS) + GTKDOC_LIBS = \ + $(top_builddir)/src/libtomoe-gtk.la \ + $(TOMOE_LIBS) \ ++ $(GUCHARMAP_LIBS) \ + $(GTK2_LIBS) + + # Extra options to supply to gtkdoc-mkdb diff --git a/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch new file mode 100644 index 000000000000..755b50a68eb0 --- /dev/null +++ b/app-i18n/libtomoe-gtk/files/libtomoe-gtk-0.6.0-underlinking.patch @@ -0,0 +1,15 @@ +diff --git a/test/Makefile.am b/test/Makefile.am +index 4f4206e..4a21629 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -42,8 +42,8 @@ LDADDS = \ + + noinst_PROGRAMS = testtomoegtk testtomoegtkedit + +-testtomoegtk_LDADD = $(LDADDS) ++testtomoegtk_LDADD = $(LDADDS) -lm + testtomoegtk_SOURCES = testtomoegtk.c + +-testtomoegtkedit_LDADD = $(LDADDS) ++testtomoegtkedit_LDADD = $(LDADDS) -lm + testtomoegtkedit_SOURCES = testtomoegtkedit.c diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild new file mode 100644 index 000000000000..870bb27a21ed --- /dev/null +++ b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="3" +PYTHON_DEPEND="python? 2" + +inherit autotools eutils python + +MY_P="tomoe-gtk-${PV}" +DESCRIPTION="Tomoe GTK+ interface widget library" +HOMEPAGE="http://tomoe.sourceforge.jp/" +SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="doc +gucharmap python static-libs" + +RDEPEND=">=app-i18n/tomoe-0.6.0[python?] + python? ( + dev-python/pygtk:2 + dev-python/pygobject:2 + ) + gucharmap? ( gnome-extra/gucharmap:0 )" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig + sys-devel/gettext + doc? ( >=dev-util/gtk-doc-1.4 )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use python ; then + python_set_active_version 2 + fi +} + +src_prepare() { + # Fix compilation with gucharmap-2.24, bug #243160 + epatch "${FILESDIR}/${P}-gucharmap2.patch" + epatch "${FILESDIR}/${P}-underlinking.patch" + + eautoreconf +} + +src_configure() { + local myconf + #--with-python b0rked + use python || myconf="${myconf} --without-python" + + econf \ + $(use_enable doc gtk-doc) \ + $(use_with gucharmap) \ + $(use_enable static-libs static) \ + ${myconf} || die +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if use python ; then + find "${ED}$(python_get_sitedir)" \( -name "*.la" -o -name "*.a" \) -type f -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.la" -type f -delete || die + fi + + dodoc AUTHORS ChangeLog NEWS README || die +} diff --git a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild new file mode 100644 index 000000000000..26e243604025 --- /dev/null +++ b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils python-single-r1 + +MY_P="tomoe-gtk-${PV}" +DESCRIPTION="Tomoe GTK+ interface widget library" +HOMEPAGE="http://tomoe.sourceforge.jp/" +SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +gucharmap python static-libs" + +RDEPEND=">=app-i18n/tomoe-0.6.0 + python? ( + ${PYTHON_DEPS} + >=app-i18n/tomoe-0.6.0[python,${PYTHON_USEDEP}] + dev-python/pygtk:2[${PYTHON_USEDEP}] + dev-python/pygobject:2[${PYTHON_USEDEP}] + ) + gucharmap? ( gnome-extra/gucharmap:0 )" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig + sys-devel/gettext + doc? ( >=dev-util/gtk-doc-1.4 )" +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use python ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + # Fix compilation with gucharmap-2.24, bug #243160 + epatch "${FILESDIR}/${P}-gucharmap2.patch" + epatch "${FILESDIR}/${P}-underlinking.patch" + + eautoreconf +} + +src_configure() { + local myconf + #--with-python b0rked hard + unset PYTHON + use python || myconf="${myconf} --without-python" + + econf \ + $(use_enable doc gtk-doc) \ + $(use_with gucharmap) \ + $(use_enable static-libs static) \ + ${myconf} || die +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if use python ; then + find "${D}$(python_get_sitedir)" \( -name "*.la" -o -name "*.a" \) -type f -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.la" -type f -delete || die + fi + + dodoc AUTHORS ChangeLog NEWS README || die +} diff --git a/app-i18n/libtomoe-gtk/metadata.xml b/app-i18n/libtomoe-gtk/metadata.xml new file mode 100644 index 000000000000..084e6cd5c686 --- /dev/null +++ b/app-i18n/libtomoe-gtk/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>cjk</herd> + <use> + <flag name="gucharmap">Enable gucharmap dictionary plugin</flag> + </use> + <upstream> + <remote-id type="sourceforge">tomoe</remote-id> + </upstream> +</pkgmetadata> |