gedit 3.0.0
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 11 Apr 2011 18:50:22 +0000 (13:50 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 11 Apr 2011 18:50:22 +0000 (13:50 -0500)
2.30.3-cygwin.patch [deleted file]
3.0.0-cygwin.patch [new file with mode: 0644]
devel.hint
gedit-3.0.0-1.cygport [moved from gedit-2.30.4-1.cygport with 64% similarity]
setup.hint

diff --git a/2.30.3-cygwin.patch b/2.30.3-cygwin.patch
deleted file mode 100644 (file)
index b246629..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- origsrc/gedit-2.30.3/gedit/Makefile.am     2010-06-20 14:43:02.000000000 -0500
-+++ src/gedit-2.30.3/gedit/Makefile.am 2010-06-28 15:30:10.947717900 -0500
-@@ -226,9 +226,10 @@ install-exec-hook:
- if PLATFORM_WIN32
-       $(mkinstalldirs) "$(DESTDIR)$(libdir)"
-       $(INSTALL_DATA) libgedit-$(GEDIT_API_VERSION).a "$(DESTDIR)$(libdir)"
--else
-+endif
-+if !OS_WIN32
-       rm -f $(DESTDIR)$(bindir)/gnome-text-editor
--      ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
-+      ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
- endif
- if !OS_WIN32
diff --git a/3.0.0-cygwin.patch b/3.0.0-cygwin.patch
new file mode 100644 (file)
index 0000000..18703a5
--- /dev/null
@@ -0,0 +1,53 @@
+--- origsrc/gedit-3.0.0/configure.ac   2011-04-04 11:12:51.000000000 -0500
++++ src/gedit-3.0.0/configure.ac       2011-04-11 11:59:47.097507000 -0500
+@@ -412,9 +412,9 @@ fi
+ # on win32 plugins must be able to resolve all symbols at link time
+ # so we create a lib
+ if test "$platform_win32" = yes; then
+-      GEDIT_IMPLIB="-lgedit-$GEDIT_API_VERSION"
+-      PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
+-      LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit-\$(GEDIT_API_VERSION).a"
++      GEDIT_IMPLIB="-lgedit"
++      PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit.a"
++      LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/gedit/libgedit.a"
+       if test "$os_win32" = yes; then
+               PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
+               LOADER_LIBTOOL_FLAGS="${LOADER_LIBTOOL_FLAGS} -mwindows"
+--- origsrc/gedit-3.0.0/gedit/Makefile.am      2011-03-27 08:14:54.000000000 -0500
++++ src/gedit-3.0.0/gedit/Makefile.am  2011-04-11 12:02:29.353389900 -0500
+@@ -235,7 +235,7 @@ if !ENABLE_GVFS_METADATA
+ libgedit_la_SOURCES += gedit-metadata-manager.c
+ endif
+-if !PLATFORM_WIN32
++if !OS_WIN32
+ libgedit_la_SOURCES += gedit-fifo.c
+ NOINST_H_FILES += gedit-fifo.h
+ endif
+@@ -281,11 +281,11 @@ if HAVE_INTROSPECTION
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS = Gedit-3.0.gir
+-Gedit-3.0.gir: gedit
++Gedit-3.0.gir: gedit$(EXEEXT)
+ INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
+ Gedit_3_0_gir_NAMESPACE = Gedit
+ Gedit_3_0_gir_VERSION = 3.0
+-Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
++Gedit_3_0_gir_PROGRAM = $(builddir)/gedit$(EXEEXT)
+ Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(BUILT_SOURCES)
+ Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
+@@ -307,9 +307,10 @@ install-exec-hook:
+ if PLATFORM_WIN32
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)"
+       $(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
+-else
++endif
++if !OS_WIN32
+       rm -f $(DESTDIR)$(bindir)/gnome-text-editor
+-      ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
++      ln -s gedit$(EXEEXT) $(DESTDIR)$(bindir)/gnome-text-editor
+ endif
+ -include $(top_srcdir)/git.mk
index 507543d7f1afc72acd54f5f521f010b243fcbea0..83090f8af65940dfb1667cd6a16d839435d36217 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Editors
-requires: gedit libatk1.0-devel libglib2.0-devel libgtk2.0-devel libgtksourceview2.0-devel
+requires: gedit libatk1.0-devel libglib2.0-devel libgtk3-devel libgtksourceview3.0-devel libpeas1.0-devel
 external-source: gedit
 sdesc: "Text editor for the GNOME Desktop (plugin development)"
 ldesc: "gedit is a small and lightweight UTF-8 text editor for the GNOME
similarity index 64%
rename from gedit-2.30.4-1.cygport
rename to gedit-3.0.0-1.cygport
index b02f8fd4941b5dd5ddefd3cf506736ce686304e4..9fb56790256b14ee54503e0606bdefaf4ea68973 100644 (file)
@@ -1,12 +1,12 @@
-inherit gnome2
+inherit python gnome2
 
 DESCRIPTION="GNOME text editor"
 
-PATCH_URI="2.30.3-cygwin.patch"
+PATCH_URI="3.0.0-cygwin.patch"
 
 PKG_NAMES="${PN} ${PN}-devel"
 PKG_HINTS="setup devel"
-gedit_CONTENTS="--exclude=gtk-doc etc/ usr/bin/ usr/lib/gedit-2/ usr/share/"
+gedit_CONTENTS="--exclude=gtk-doc etc/ usr/bin/ usr/lib/gedit/ ${PYTHON_SITELIB#/} usr/share/"
 gedit_devel_CONTENTS="usr/include/ usr/lib/lib* usr/lib/pkgconfig/ usr/share/gtk-doc/"
 
 DIFF_EXCLUDES="*.desktop.in *.schemas.in"
index e9e890b76846b92361b78bc2f4fc9c0f7f3449ec..0765779771cb231bd95005ddb1c5365c3bcf0a5f 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome Editors
-requires: GConf2 libatk1.0_0 libcairo2 libenchant1 libgcc1 libgconf2_4 libgdk_pixbuf2.0_0 libglib2.0_0 libgtk2.0_0 libgtksourceview2.0_0 libICE6 libintl8 libpango1.0_0 libSM6 libX11_6 libxml2 python python-gobject2.0 python-gtk2.0 python-gtksourceview2
+requires: libatk1.0_0 libcairo2 libenchant1 libgdk_pixbuf2.0_0 libgirepository1.0_1 libglib2.0_0 libgtk3_0 libgtksourceview3.0_0 libICE6 libintl8 libpango1.0_0 libpeas1.0_0 libSM6 libX11_6 libxml2 girepository-Gtk3.0
 sdesc: "Text editor for the GNOME Desktop"
 ldesc: "gedit is a small and lightweight UTF-8 text editor for the GNOME
 environment. Complete GNOME integration is featured, with support for
This page took 0.027731 seconds and 5 git commands to generate.