Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #518 from KrullKorg/master

Browse Source 
new package libical-glib; eog and eog-plugins updated to 3.16.0
This commit is contained in:
Алексей
2015-03-26 05:35:52 +02:00
parent 5bd45567d0 bfc4b6df29
commit 55c9830ba6
7 changed files with 135 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mingw-w64-eog-plugins/001-win.patch
View File

@@ -1,15 +1,15 @@
--- ./configure.ac.orig 2014-10-18 00:09:48.261871000 +0200
+++ ./configure.ac 2014-10-18 00:09:50.288980900 +0200
--- ./configure.ac.orig 2015-03-25 18:12:11.388179700 +0100
+++ ./configure.ac 2015-03-25 18:12:49.726012100 +0100
@@ -46,6 +46,7 @@
glib-2.0 >= 2.32.0
gtk+-3.0 >= 3.3.8
glib-2.0 >= 2.38.0
gtk+-3.0 >= 3.14.0
libpeas-1.0 >= 0.7.4
+ libpeas-gtk-1.0 >= 0.7.4
eog >= 3.11.4
eog >= 3.15.90
])
AC_SUBST(EOG_LIBS)
--- ./plugins/exif-display/Makefile.am.orig 2014-08-10 17:37:36.000000000 +0200
+++ ./plugins/exif-display/Makefile.am 2014-10-17 22:27:17.935709100 +0200
+++ ./plugins/exif-display/Makefile.am 2015-03-25 18:12:11.398181200 +0100
@@ -25,10 +25,11 @@
eog-exif-display-plugin-setup.h
@@ -24,7 +24,7 @@
eog-exif-display-plugin-resources.c: eog-exif-display-plugin.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/eog-exif-display-plugin.gresource.xml)
--- ./plugins/fit-to-width/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/fit-to-width/Makefile.am 2014-10-17 22:38:10.051051300 +0200
+++ ./plugins/fit-to-width/Makefile.am 2015-03-25 18:12:11.448183500 +0100
@@ -15,9 +15,9 @@
eog-fit-to-width-plugin.c
@@ -38,7 +38,7 @@
# Plugin Info
--- ./plugins/hide-titlebar/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/hide-titlebar/Makefile.am 2014-10-17 22:38:33.070962400 +0200
+++ ./plugins/hide-titlebar/Makefile.am 2015-03-25 18:12:11.455184100 +0100
@@ -15,9 +15,9 @@
eog-hide-titlebar-plugin.c
@@ -52,7 +52,7 @@
# Plugin Info
--- ./plugins/light-theme/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/light-theme/Makefile.am 2014-10-17 22:38:39.586328900 +0200
+++ ./plugins/light-theme/Makefile.am 2015-03-25 18:12:11.461204300 +0100
@@ -15,9 +15,9 @@
eog-light-theme-plugin.c
@@ -66,7 +66,7 @@
# Plugin Info
--- ./plugins/map/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/map/Makefile.am 2014-10-17 22:39:13.779262400 +0200
+++ ./plugins/map/Makefile.am 2015-03-25 18:12:11.474185900 +0100
@@ -18,7 +18,9 @@
libmap_la_LDFLAGS = \
$(PLUGIN_LIBTOOL_FLAGS) \
@@ -79,7 +79,7 @@
# Plugin Info
--- ./plugins/postasa/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/postasa/Makefile.am 2014-10-17 22:39:32.713163200 +0200
+++ ./plugins/postasa/Makefile.am 2015-03-25 18:12:11.532189200 +0100
@@ -24,10 +24,12 @@
libpostasa_la_LDFLAGS = \
@@ -95,8 +95,8 @@
eog-postasa-plugin-resources.c: eog-postasa-plugin.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/eog-postasa-plugin.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/eog-postasa-plugin.gresource.xml
--- ./plugins/postr/Makefile.am.orig 2014-10-17 22:46:12.801774300 +0200
+++ ./plugins/postr/Makefile.am 2014-10-17 22:46:21.972346700 +0200
--- ./plugins/postr/Makefile.am.orig 2015-02-15 14:53:30.000000000 +0100
+++ ./plugins/postr/Makefile.am 2015-03-25 18:12:11.563210600 +0100
@@ -15,9 +15,10 @@
eog-postr-plugin.c
@@ -111,7 +111,7 @@
# Plugin Info
--- ./plugins/send-by-mail/Makefile.am.orig 2014-08-09 20:39:08.000000000 +0200
+++ ./plugins/send-by-mail/Makefile.am 2014-10-17 22:39:44.313194800 +0200
+++ ./plugins/send-by-mail/Makefile.am 2015-03-25 18:12:11.593212500 +0100
@@ -15,9 +15,9 @@
eog-send-by-mail-plugin.c

8
mingw-w64-eog-plugins/PKGBUILD
View File

@@ -2,7 +2,7 @@
_realname=eog-plugins
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.14.1
pkgver=3.16.0
pkgrel=1
arch=('any')
pkgdesc="Eye of GNOME graphics viewer program - plugins (mingw-w64)"
@@ -20,14 +20,14 @@ url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz
001-win.patch
002-champlain.patch)
sha256sums=('12070173d875d6e9f70d8b918bbf3dfcc5af8c1681e4fabf212dae96b85318f5'
'8dcb1e721785460d58f32911c52de3b41ddeb23cc3326ba07f5c95ec60471818'
sha256sums=('6fab1c1e0705fc2b0e4a63caf3ba1c5b64b4eaa1301e4cbc04bb934428b68450'
'7b5a599b0fb719156747627944cae4b1107ffb8f11bcaddf0c8100d89c93548d'
'3b7fab068ff3739fed247f72abbc18accb409b9008593e806f5c4e3df1d9b32d')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-win.patch
patch -b -V simple -p1 -i ${srcdir}/001-win.patch
patch -p1 -i ${srcdir}/002-champlain.patch
autoreconf -isf

26
mingw-w64-eog/001-win.patch
View File

@@ -292,32 +292,6 @@
#include <gtk/gtk.h>
#include <libpeas/peas-extension-set.h>
@@ -4746,24 +4745,8 @@
* By ensuring we keep the GAppInfo around, we avoid the
* possibility of that situation occurring.
*/
- static GDesktopAppInfo *app_info = NULL;
- static gboolean initialised;
- if (!initialised) {
- gchar *editor;
-
- editor = g_settings_get_string (window->priv->ui_settings,
- EOG_CONF_UI_EXTERNAL_EDITOR);
-
- if (editor != NULL) {
- app_info = g_desktop_app_info_new (editor);
- }
-
- initialised = TRUE;
- g_free (editor);
- }
-
- return (GAppInfo *) app_info;
+ return NULL;
}
static void
--- ./src/Makefile.am.orig 2014-10-15 21:46:54.750243900 +0200
+++ ./src/Makefile.am 2014-10-16 20:30:25.278428300 +0200
@@ -186,21 +186,21 @@

188
mingw-w64-eog/002-relocation-support.patch
View File

@@ -1,7 +1,6 @@
diff -Naur eog-3.14.1-orig/src/eog-application.c eog-3.14.1/src/eog-application.c
--- eog-3.14.1-orig/src/eog-application.c 2014-07-22 13:42:43.000000000 +0400
+++ eog-3.14.1/src/eog-application.c 2014-10-19 11:41:44.795200000 +0400
@@ -284,8 +284,20 @@
--- ./src/eog-application.c.orig 2015-03-19 21:02:08.000000000 +0100
+++ ./src/eog-application.c 2015-03-25 21:54:04.447015200 +0100
@@ -318,8 +318,20 @@
g_object_unref (provider);
/* Add application specific icons to search path */
@@ -23,7 +22,7 @@ diff -Naur eog-3.14.1-orig/src/eog-application.c eog-3.14.1/src/eog-application.
gtk_window_set_default_icon_name ("eog");
g_set_application_name (_("Image Viewer"));
@@ -307,6 +319,7 @@
@@ -342,6 +354,7 @@
G_CALLBACK (on_extension_removed), app);
peas_extension_set_call (app->priv->extensions, "activate");
@@ -31,164 +30,59 @@ diff -Naur eog-3.14.1-orig/src/eog-application.c eog-3.14.1/src/eog-application.
}
static void
@@ -442,8 +455,20 @@
priv->ui_settings = g_settings_new (EOG_CONF_UI);
+ gchar * eog_toolbar_file;
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_toolbar_file = g_build_filename (dir, "share", "eog", "eog-toolbar.xml", NULL);
+ g_free (dir);
+}
+#else
+ eog_toolbar_file = g_strdup (EOG_DATA_DIR G_DIR_SEPARATOR_S "eog-toolbar.xml");
+#endif
egg_toolbars_model_load_names (priv->toolbars_model,
- EOG_DATA_DIR "/eog-toolbar.xml");
+ eog_toolbar_file);
if (G_LIKELY (dot_dir != NULL))
priv->toolbars_file = g_build_filename
@@ -453,13 +478,14 @@
priv->toolbars_file)) {
egg_toolbars_model_load_toolbars (priv->toolbars_model,
- EOG_DATA_DIR "/eog-toolbar.xml");
+ eog_toolbar_file);
}
egg_toolbars_model_set_flags (priv->toolbars_model, 0,
EGG_TB_MODEL_NOT_REMOVABLE);
eog_application_load_accelerators ();
+ g_free(eog_toolbar_file);
}
/**
@@ -780,12 +806,26 @@
priv->toolbars_model = egg_toolbars_model_new ();
+ gchar * eog_toolbar_file;
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_toolbar_file = g_build_filename (dir, "share", "eog", "eog-toolbar.xml", NULL);
+ g_free (dir);
+}
+#else
+ eog_toolbar_file = g_strdup (EOG_DATA_DIR G_DIR_SEPARATOR_S "eog-toolbar.xml");
+#endif
egg_toolbars_model_load_names (priv->toolbars_model,
- EOG_DATA_DIR "/eog-toolbar.xml");
+ eog_toolbar_file);
egg_toolbars_model_load_toolbars (priv->toolbars_model,
- EOG_DATA_DIR "/eog-toolbar.xml");
+ eog_toolbar_file);
egg_toolbars_model_set_flags (priv->toolbars_model, 0,
EGG_TB_MODEL_NOT_REMOVABLE);
+
+ g_free(eog_toolbar_file);
}
static void
diff -Naur eog-3.14.1-orig/src/eog-plugin-engine.c eog-3.14.1/src/eog-plugin-engine.c
--- eog-3.14.1-orig/src/eog-plugin-engine.c 2014-01-14 00:17:51.000000000 +0400
+++ eog-3.14.1/src/eog-plugin-engine.c 2014-10-19 11:49:44.495200000 +0400
@@ -85,7 +85,19 @@
const gchar * const * system_data_dirs;
GError *error = NULL;
- private_path = g_build_filename (LIBDIR, "eog",
+ gchar * eog_lib_dir;
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_lib_dir = g_build_filename (dir, "lib", NULL);
+ g_free (dir);
+}
+#else
+ eog_lib_dir = g_strdup (LIBDIR);
+#endif
+ private_path = g_build_filename (eog_lib_dir,
"girepository-1.0", NULL);
/* This should be moved to libpeas */
@@ -117,6 +129,7 @@
}
g_free (private_path);
+ g_free (eog_lib_dir);
engine = EOG_PLUGIN_ENGINE (g_object_new (EOG_TYPE_PLUGIN_ENGINE,
NULL));
@@ -150,10 +163,24 @@
--- ./src/eog-plugin-engine.c.orig 2014-01-13 21:17:51.000000000 +0100
+++ ./src/eog-plugin-engine.c 2015-03-25 21:58:09.584059500 +0100
@@ -150,10 +150,33 @@
}
/* Find system-wide plugins */
- eog_debug_message (DEBUG_PLUGINS, "Adding system plugin dir ("
- EOG_PLUGIN_DIR ")to plugins search path");
+ gchar * eog_plugin_dir;
+ gchar * eog_data_plugin_dir;
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+ gchar *dir;
+ gchar *eog_plugin_dir;
+ gchar *eog_data_plugin_dir;
+ gchar *debug_message;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_plugin_dir = g_build_filename (dir, "lib", "eog", "plugins", NULL);
+ eog_data_plugin_dir = g_build_filename (dir, "share", "eog", "plugins", NULL);
+ g_free (dir);
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_plugin_dir = g_build_filename (dir, "lib", "eog", "plugins", NULL);
+ eog_data_plugin_dir = g_build_filename (dir, "share", "eog", "plugins", NULL);
+ g_free (dir);
+
+ debug_message = g_strdup_printf ("Adding system plugin dir (%s) to plugins search path", eog_plugin_dir);
+ eog_debug_message (DEBUG_PLUGINS, debug_message);
+ peas_engine_add_search_path (PEAS_ENGINE (engine),
+ eog_plugin_dir, eog_data_plugin_dir);
+
+ g_free (eog_plugin_dir);
+ g_free (eog_data_plugin_dir);
+ g_free (debug_message);
+}
+#else
+ eog_plugin_dir = g_strdup (EOG_PLUGIN_DIR);
+ eog_data_plugin_dir = g_strdup (EOG_PLUGIN_DATA_DIR);
+#endif
+ eog_debug_message (DEBUG_PLUGINS, "Adding system plugin dir (%s) to plugins search path", eog_plugin_dir);
eog_debug_message (DEBUG_PLUGINS, "Adding system plugin dir ("
EOG_PLUGIN_DIR ")to plugins search path");
peas_engine_add_search_path (PEAS_ENGINE (engine),
- EOG_PLUGIN_DIR, EOG_PLUGIN_DATA_DIR);
+ eog_plugin_dir, eog_data_plugin_dir);
EOG_PLUGIN_DIR, EOG_PLUGIN_DATA_DIR);
+#endif
g_settings_bind (engine->priv->plugins_settings,
EOG_CONF_PLUGINS_ACTIVE_PLUGINS,
@@ -162,6 +190,8 @@
G_SETTINGS_BIND_DEFAULT);
--- ./src/main.c.orig 2015-02-08 15:16:05.000000000 +0100
+++ ./src/main.c 2015-03-25 21:54:04.655026900 +0100
@@ -92,7 +92,17 @@
GError *error = NULL;
GOptionContext *ctx;
g_free (user_plugin_path);
+ g_free (eog_plugin_dir);
+ g_free (eog_data_plugin_dir);
return engine;
}
diff -Naur eog-3.14.1-orig/src/eog-thumbnail.c eog-3.14.1/src/eog-thumbnail.c
--- eog-3.14.1-orig/src/eog-thumbnail.c 2014-03-22 23:09:38.000000000 +0400
+++ eog-3.14.1/src/eog-thumbnail.c 2014-10-19 12:16:07.387600000 +0400
@@ -533,7 +533,20 @@
void
eog_thumbnail_init (void)
{
+ gchar * eog_data_dir;
+#ifdef G_OS_WIN32
+{
+ gchar *dir;
+ gchar *dir;
+
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ eog_data_dir = g_build_filename (dir, "share", "eog", "/pixmaps/thumbnail-frame.png", NULL);
+ g_free (dir);
+ dir = g_win32_get_package_installation_directory_of_module (NULL);
+ bindtextdomain (PACKAGE, g_build_filename (dir, "share", "locale", NULL));
+ g_free (dir);
+}
+#else
+ eog_data_dir = g_strdup (EOG_DATA_DIR "/pixmaps/thumbnail-frame.png");
bindtextdomain (PACKAGE, EOG_LOCALE_DIR);
+#endif
if (frame == NULL) {
- frame = gdk_pixbuf_new_from_file (EOG_DATA_DIR "/pixmaps/thumbnail-frame.png", NULL);
+ frame = gdk_pixbuf_new_from_file (eog_data_dir, NULL);
}
+ g_free (eog_data_dir);
}
bind_textdomain_codeset (PACKAGE, "UTF-8");
textdomain (PACKAGE);

9
mingw-w64-eog/PKGBUILD
View File

@@ -2,7 +2,7 @@
_realname=eog
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.14.3
pkgver=3.16.0
pkgrel=1
arch=('any')
pkgdesc="Eye of GNOME graphics viewer program (mingw-w64)"
@@ -29,9 +29,9 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_real
002-relocation-support.patch
003-fix-install-dirs.patch
004-give-cc-to-gir-scanner.mingw.patch)
sha256sums=('c05a3c0a75c3c5d42f41eadca9e23753d1fa59bc37fb5826909b468b9be1cf59'
'1309ea222055d951fbe5c1c9be0245adecdfe221ee9ce0b2cef8fab3597d3864'
'2a1b947202e765011ee37c40786baee96c04e23962a481bcee36757cabc3c669'
sha256sums=('289f659ce593adb15868d73895634b5f4445c87fe84715eb598405d1d0e7a85e'
'31db56ea4d64059e60c478a7ba1475d9beaf65f2c42967909adbb41843c2d129'
'a7e897da94d7033fd2ad4d81129f7a60cd0f68bd8d887c079c79cef802d02a4d'
'abc9df56f5fc2213ba6efdcdad269534496d6eda900194b4000910dacf4042d9'
'8fd79bb5f0e411d682abd7cffa3b9b8476cf8a073ea17c2e0bd1a386e3b060e0')
@@ -42,6 +42,7 @@ prepare() {
patch -p1 -i ${srcdir}/002-relocation-support.patch
patch -p1 -i ${srcdir}/003-fix-install-dirs.patch
patch -p1 -i ${srcdir}/004-give-cc-to-gir-scanner.mingw.patch
autoreconf -isf
}

21
mingw-w64-libical-glib/001-win.patch Normal file
View File

@@ -0,0 +1,21 @@
--- ./src/build-tools/generator.c.orig 2015-03-25 17:48:37.812068900 +0100
+++ ./src/build-tools/generator.c 2015-03-25 17:48:40.060777800 +0100
@@ -84,7 +84,7 @@
if (iter == strlen (full_flag)) {
full_comment = g_new (gchar, strlen (para->comment) - strlen (full_flag) + 1);
- stpcpy (full_comment, para->comment + strlen(full_flag));
+ g_stpcpy (full_comment, para->comment + strlen(full_flag));
buffer = g_strconcat (res, "\n * ", full_comment, NULL);
g_free (res);
res = buffer;
--- ./src/libical-glib/Makefile.am.orig 2015-03-25 17:47:15.849595300 +0100
+++ ./src/libical-glib/Makefile.am 2015-03-25 17:47:22.483886100 +0100
@@ -131,6 +131,7 @@
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
$(NULL)
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
if HAVE_INTROSPECTION
introspection_sources = $(libical_glib_1_0_la_SOURCES)

50
mingw-w64-libical-glib/PKGBUILD Normal file
View File

@@ -0,0 +1,50 @@
# Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
_realname=libical-glib
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.0.2
pkgrel=1
arch=('any')
pkgdesc="An iCalendar library based on libical and introspectable by GObject Introspection (mingw-w64)"
depends=("${MINGW_PACKAGE_PREFIX}-libical"
"${MINGW_PACKAGE_PREFIX}-glib2"
"${MINGW_PACKAGE_PREFIX}-libxml2")
makedepends=("gtk-doc"
"${MINGW_PACKAGE_PREFIX}-vala"
"${MINGW_PACKAGE_PREFIX}-gobject-introspection")
options=('strip' 'staticlibs')
license=("LGPL 2.1")
url="http://www.gnome.org/"
source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz
001-win.patch)
sha256sums=('0ea3726bc9aff063b223d071465f2f87ef63507b92c8cb36e45a4e4e48de75a4'
'4e34ccb69bd5356071b4d0ee96cf5b7148f6ae7dd3815861dee4fbb8e99156fd')
prepare() {
cd ${_realname}-${pkgver}
patch -b -V simple -p1 -i ${srcdir}/001-win.patch
autoreconf -fi
}
build() {
mkdir -p build-${MINGW_CHOST}
cd build-${MINGW_CHOST}
../${_realname}-${pkgver}/configure \
--prefix=${MINGW_PREFIX} \
--libexecdir=${MINGW_PREFIX}/lib \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--enable-introspection=yes
make
}
package() {
cd "$srcdir/build-${MINGW_CHOST}"
make DESTDIR=$pkgdir install
install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
}