From: Andrea Zagli Date: Sun, 17 May 2015 18:40:48 +0000 (+0200) Subject: seed: relocation e aggiustamenti. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=5d8fbe8ffc896d0c8fb9b238e117516c371de9d5;p=msys2 seed: relocation e aggiustamenti. --- diff --git a/packages/mingw-w64-seed/001-win.patch b/packages/mingw-w64-seed/001-win.patch index cd0b301..46f2c0f 100644 --- a/packages/mingw-w64-seed/001-win.patch +++ b/packages/mingw-w64-seed/001-win.patch @@ -1,6 +1,14 @@ --- ./configure.ac.orig 2013-04-16 09:59:57.000000000 +0200 -+++ ./configure.ac 2015-05-09 23:06:38.721990600 +0200 -@@ -128,6 +128,9 @@ ++++ ./configure.ac 2015-05-11 18:28:42.965781000 +0200 +@@ -4,6 +4,7 @@ + AM_INIT_AUTOMAKE([1.7 -Wno-portability]) + AM_MAINTAINER_MODE([enable]) + AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + AC_CANONICAL_HOST + +@@ -128,6 +129,9 @@ dnl ========================GIO================================================ PKG_CHECK_MODULES(GIO, gio-2.0) @@ -11,7 +19,7 @@ dnl ==== canvas ==== AC_ARG_ENABLE(canvas-module, --- ./libseed/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./libseed/Makefile.am 2015-05-09 23:06:38.727991000 +0200 ++++ ./libseed/Makefile.am 2015-05-11 18:28:42.972782300 +0200 @@ -33,10 +33,12 @@ $(SEED_DEBUG_CFLAGS) \ $(SEED_PROFILE_CFLAGS) \ @@ -35,7 +43,7 @@ seedheaders_HEADERS = seed.h seed-debug.h seed-module.h --- ./libseed/seed-engine.c.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./libseed/seed-engine.c 2015-05-09 23:06:38.754991500 +0200 ++++ ./libseed/seed-engine.c 2015-05-11 18:36:06.804432000 +0200 @@ -21,7 +21,6 @@ #include "seed-path.h" @@ -44,8 +52,32 @@ #include #include #include +@@ -1794,9 +1793,21 @@ + seed_initialize_importer (eng->context, eng->global); + seed_gtype_init (eng); + ++ gchar *dir; ++ gchar *path; ++ ++ dir = g_win32_get_package_installation_directory_of_module (NULL); ++ path = g_build_filename(dir, "share", "seed-gtk3", NULL); ++ g_free (dir); ++ ++ dir = g_strconcat ("Seed.include(\"", path, ++ "\extensions\Seed.js\");", NULL); ++g_message("DIR %s", dir); + defaults_script = +- JSStringCreateWithUTF8CString ("Seed.include(\"" SEED_PREFIX_PATH +- "extensions/Seed.js\");"); ++ JSStringCreateWithUTF8CString (dir); ++ ++ g_free (path); ++ g_free (dir); + + JSEvaluateScript (eng->context, defaults_script, NULL, NULL, 0, NULL); + --- ./libseed/seed-importer.c.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./libseed/seed-importer.c 2015-05-09 23:06:38.761993200 +0200 ++++ ./libseed/seed-importer.c 2015-05-11 18:28:42.986782500 +0200 @@ -17,6 +17,8 @@ * Copyright (C) Robert Carr 2009 */ @@ -55,8 +87,8 @@ #include #include #include ---- ./Makefile.am.orig 2015-05-09 23:13:57.741040300 +0200 -+++ ./Makefile.am 2015-05-09 23:14:00.415360200 +0200 +--- ./Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 ++++ ./Makefile.am 2015-05-11 18:28:42.994782800 +0200 @@ -7,8 +7,7 @@ src \ extensions \ @@ -68,7 +100,7 @@ doc_DATA = \ README \ --- ./modules/cairo/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/cairo/Makefile.am 2015-05-09 23:06:38.766992800 +0200 ++++ ./modules/cairo/Makefile.am 2015-05-11 18:28:43.000782800 +0200 @@ -35,7 +35,8 @@ -module -avoid-version \ $(GOBJECT_INTROSPECTION_LDFLAGS) \ @@ -80,7 +112,7 @@ libseed_cairo_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/canvas/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/canvas/Makefile.am 2015-05-09 23:06:38.796995000 +0200 ++++ ./modules/canvas/Makefile.am 2015-05-11 18:28:43.006782900 +0200 @@ -19,7 +19,8 @@ libseed_canvas_la_LDFLAGS = \ -module -avoid-version \ @@ -92,7 +124,7 @@ libseed_canvas_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/dbus/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/dbus/Makefile.am 2015-05-09 23:06:38.809996000 +0200 ++++ ./modules/dbus/Makefile.am 2015-05-11 18:28:43.011783600 +0200 @@ -40,7 +40,8 @@ $(GOBJECT_INTROSPECTION_LDFLAGS) \ $(DBUS_LDFLAGS) \ @@ -104,11 +136,13 @@ libseed_dbusnative_la_LIBADD = \ -ldbus-1 \ --- ./modules/DynamicObject/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/DynamicObject/Makefile.am 2015-05-09 23:06:38.814996400 +0200 -@@ -18,6 +18,10 @@ ++++ ./modules/DynamicObject/Makefile.am 2015-05-11 18:35:00.049309600 +0200 +@@ -17,7 +17,11 @@ + libseed_DynamicObject_la_LDFLAGS = \ -module -avoid-version \ $(GOBJECT_INTROSPECTION_LDFLAGS) \ - $(SEED_PROFILE_LIBS) +- $(SEED_PROFILE_LIBS) ++ $(SEED_PROFILE_LIBS) \ + -no-undefined + +libseed_DynamicObject_la_LIBADD = \ @@ -117,7 +151,7 @@ endif --- ./modules/example/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/example/Makefile.am 2015-05-09 23:06:38.818996300 +0200 ++++ ./modules/example/Makefile.am 2015-05-11 18:28:43.043785700 +0200 @@ -16,7 +16,8 @@ libseed_example_la_LDFLAGS = \ @@ -129,7 +163,7 @@ libseed_example_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/ffi/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/ffi/Makefile.am 2015-05-09 23:06:38.823996700 +0200 ++++ ./modules/ffi/Makefile.am 2015-05-11 18:28:43.047785900 +0200 @@ -25,7 +25,8 @@ libseed_ffi_la_LDFLAGS = \ -module -avoid-version \ @@ -141,7 +175,7 @@ libseed_ffi_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/gettext/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/gettext/Makefile.am 2015-05-09 23:06:38.829996400 +0200 ++++ ./modules/gettext/Makefile.am 2015-05-11 18:28:43.054786500 +0200 @@ -16,7 +16,8 @@ libseed_gettext_la_LDFLAGS = \ @@ -153,7 +187,7 @@ libseed_gettext_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/gettext/seed-gettext.c.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/gettext/seed-gettext.c 2015-05-09 23:06:38.833997400 +0200 ++++ ./modules/gettext/seed-gettext.c 2015-05-11 18:28:43.060786500 +0200 @@ -313,12 +313,28 @@ DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY); DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES); @@ -184,7 +218,7 @@ return ns_ref; --- ./modules/gtkbuilder/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/gtkbuilder/Makefile.am 2015-05-09 23:06:38.840998300 +0200 ++++ ./modules/gtkbuilder/Makefile.am 2015-05-11 18:28:43.067787400 +0200 @@ -19,7 +19,8 @@ libseed_gtkbuilder_la_LDFLAGS = \ -module -avoid-version \ @@ -196,7 +230,7 @@ libseed_gtkbuilder_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/libxml/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/libxml/Makefile.am 2015-05-09 23:06:38.845998700 +0200 ++++ ./modules/libxml/Makefile.am 2015-05-11 18:28:43.072787800 +0200 @@ -20,7 +20,8 @@ libseed_libxml_la_LDFLAGS = \ -module -avoid-version \ @@ -208,7 +242,7 @@ libseed_libxml_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/multiprocessing/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/multiprocessing/Makefile.am 2015-05-09 23:06:38.852998800 +0200 ++++ ./modules/multiprocessing/Makefile.am 2015-05-11 18:28:43.079788000 +0200 @@ -18,7 +18,8 @@ libseed_multiprocessing_la_LDFLAGS = \ @@ -220,7 +254,7 @@ libseed_multiprocessing_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/multiprocessing/seed-multiprocessing.c.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/multiprocessing/seed-multiprocessing.c 2015-05-09 23:06:38.858999300 +0200 ++++ ./modules/multiprocessing/seed-multiprocessing.c 2015-05-11 18:28:43.086788100 +0200 @@ -17,6 +17,10 @@ * Copyright (C) Robert Carr 2009 */ @@ -233,7 +267,7 @@ #include --- ./modules/readline/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/readline/Makefile.am 2015-05-09 23:06:38.865999400 +0200 ++++ ./modules/readline/Makefile.am 2015-05-11 18:28:43.107789700 +0200 @@ -18,7 +18,8 @@ libseed_readline_la_LDFLAGS = \ -module -avoid-version \ @@ -245,7 +279,7 @@ libseed_readline_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/sandbox/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/sandbox/Makefile.am 2015-05-09 23:06:38.869999700 +0200 ++++ ./modules/sandbox/Makefile.am 2015-05-11 18:28:43.111789200 +0200 @@ -15,7 +15,8 @@ libseed_sandbox_la_LDFLAGS = \ @@ -257,7 +291,7 @@ libseed_sandbox_la_LIBADD = \ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \ --- ./modules/sqlite/Makefile.am.orig 2013-04-16 09:58:20.000000000 +0200 -+++ ./modules/sqlite/Makefile.am 2015-05-09 23:06:38.875000500 +0200 ++++ ./modules/sqlite/Makefile.am 2015-05-11 18:28:43.116789200 +0200 @@ -20,7 +20,8 @@ -module -avoid-version \ $(GOBJECT_INTROSPECTION_LDFLAGS) \ diff --git a/packages/mingw-w64-seed/PKGBUILD b/packages/mingw-w64-seed/PKGBUILD index c8e7f10..6235e19 100644 --- a/packages/mingw-w64-seed/PKGBUILD +++ b/packages/mingw-w64-seed/PKGBUILD @@ -6,7 +6,7 @@ pkgver=3.8.1 pkgrel=1 arch=('any') pkgdesc="GNOME WebKit Javascript bindings (mingw-w64)" -options=(strip staticlibs) +options=(!strip debug staticlibs) depends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas" "${MINGW_PACKAGE_PREFIX}-libxml2" @@ -28,7 +28,7 @@ url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-$pkgver.tar.xz 001-win.patch) sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32' - '90ea22de1f3532cb53807e836ea44b1723555b257982c9aa58e2a921a5d2aa9f') + 'a9479802b32b52a41ee03b2e98f46e7dfae9b47943dcaaf0323d4551cbdd0bd3') prepare() { cd "${srcdir}"/${_realname}-${pkgver}