From 69d502c2c3bffacdd87aa95a9e4d3dbc8323d502 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 10 Jan 2015 10:56:09 +0000 Subject: [PATCH] Remove unnecessary patch. Fix the ebuild not to use non-existing patches. Add missing [introspection] deps. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- media-gfx/entangle/ChangeLog | 9 +- media-gfx/entangle/Manifest | 33 ++--- media-gfx/entangle/entangle-0.6.0.ebuild | 15 +- .../entangle-0.5.0+libgphoto2-2.5.0.patch | 129 ------------------ 4 files changed, 28 insertions(+), 158 deletions(-) delete mode 100644 media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch diff --git a/media-gfx/entangle/ChangeLog b/media-gfx/entangle/ChangeLog index 3b643ded3665..be05f47ba5e7 100644 --- a/media-gfx/entangle/ChangeLog +++ b/media-gfx/entangle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/entangle -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.10 2014/12/30 19:12:20 dilfridge Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/ChangeLog,v 1.11 2015/01/10 10:56:06 mgorny Exp $ + + 10 Jan 2015; Michał Górny + -files/entangle-0.5.0+libgphoto2-2.5.0.patch, entangle-0.6.0.ebuild: + Remove unnecessary patch. Fix the ebuild not to use non-existing patches. Add + missing [introspection] deps. *entangle-0.6.0 (30 Dec 2014) diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest index ffb1aef4fa0a..a424b30ab9d4 100644 --- a/media-gfx/entangle/Manifest +++ b/media-gfx/entangle/Manifest @@ -1,25 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX entangle-0.5.0+libgphoto2-2.5.0.patch 5213 SHA256 aa18cc0d5b4330a5fb60c856181fe980f18277249aa78be9b7d052563e3fa67e SHA512 492eb26dbbeafd8eea201781306c280ca8e30bcdd692cc79c5469a8e4395a4cd8be571310b63d9d4ccdaff03524bac6bbf0dea44caabea0adf2b54b8c1efad86 WHIRLPOOL d71ca4b41145f36f9137a6d2f119981da8ec5f2df3aa5242725f57089f7bba3c670d5611b90c0ad129fca8cf1af5266717503a54e85b913a6a81b05a8e23d02e DIST entangle-0.6.0.tar.gz 906858 SHA256 d13eef54f8f501cac1e854de9d3841042777cabee7ffd1c804180e717bf485bd SHA512 f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960 WHIRLPOOL 539a7d1821beff0c3f8dfd439ed633348ba07380f3968d3c8a3261911235975ab04a7c858a2c017b12d6c7b355bca8c6395e2fe6549409573fbc7d68bed74f35 -EBUILD entangle-0.6.0.ebuild 1220 SHA256 9ea03a06eee0520a560cbe6ad829231b6f6103573b074cc10f29967bd6687691 SHA512 61b934ddfea1fd1c4d222695ab6cadc80cdc683ca93c4fd549cf3852d8c02fb4e4b84df6e1c70fca9dcce4054248c9c94ae08598d6025949bf73a375964b05eb WHIRLPOOL 1dfb2d7058fb5d8c3a9e277eb695a48ab3cdacd6e8b9b17c0215dcc76538a9f94cdc4912939d17404b6c360c789c936a066c48a13b9ee6c602eca74276fed619 -MISC ChangeLog 2121 SHA256 21d1d4adef0f881e4b0bddfbe887730120cf5918341113e88cde37c0d148cfbf SHA512 781005c30459ce8aca197b3f01219c76dfc58027fbff3d252f08adad49faeb8277d9d6a98fedbb3628e31defb6f44ebc9e664053a9dd1fc07efbee6a0d5eb4d6 WHIRLPOOL 033c37dd0b14ad4dd668c7011e75e51269f6992ffa423d03990773d165686f0d89cad7690864f72c2e39460636f60a4b96454ee95e5bb98a0bf55f520df5eeca +EBUILD entangle-0.6.0.ebuild 1106 SHA256 319449f62627fae33268e3cc7191f632f344b1431de31e24a304333b51c0eab9 SHA512 64f30b0865b7f52061c2da69ad079b704686525607d829c9c56c853014d28acad670562981a3a17557728bb0fad659da99c57f30b67dbe9dff55d3ca205c93d1 WHIRLPOOL bf00ba00af1942376bbfd621b10a14f057272bf3dec02b79671eaceac8dbb68d73d4edbdd0dbaf02986b324d7600de7ad267afde75803195397529d199080647 +MISC ChangeLog 2352 SHA256 278e159a0ef8bfce8cbed4119abf72761ad3d2f5e3218007c3c714153648c45d SHA512 bab08a973afb630c43ed51245cca85fc38186a637d8549a5f34f3c203814846ed624aaf3fba637b1ac22f9e0f189d6099136b04f796dbd0827643360cd8b0bde WHIRLPOOL 0a20cf5d61e1701830e14830056b2383895704a98f93ffaf1837a249a8b95c281f6dcf6d10f0c69e3f2d1b2a92475ce9b4faebc98c716a1f9e26085a3a0fad74 MISC metadata.xml 300 SHA256 6d49bc72f56d736a9246f24c1399669181a1a341d62abab12ac7bad56c234878 SHA512 d6996d0b9e04f69dec39779fd1ceca7803c57e61d746dc61c59b201bf57b3304518df0546663c6a1425606cb153f37377e86dbb867685cf8733d60aadbe7a0fb WHIRLPOOL 263c159a5ae9d24bec54bae2c9fb641d8ae3ad01fef01a9b6d87f5722f101bc595c7c14335d2812731e5daa6442a09c5f9a996de78966b4f055ea8e232307769 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUovlwAAoJEJS/30SErRQvzG4P/A6CbTyTZLmSsun/SEy1MpFa -RTcY/LxFu0uJdKMhhduO48qU94lVw4DkUkiT3O5xIYtS9bF2ZVIdyU0HgjMbjT+3 -gPtlOWFX3kMg+nNr3DtYvpuQOWR202IKBYWnvMs+AGQvd/Z42n4a90sdI99dmy4J -v808EWVHftdPhceDwJoU7KRWDbOlIapuRpFdlk37xcWgf76oVoNWVAZNGpUbXabP -vZUdCqSCXxXbmF4HrtVOFHUSZC1csKDH93VuRo4nwkrxoMHM5JUaobBDFvMyJUqH -jJTIXolCP9nSXJAc/DCqr5Ou72SVF1YBpWhuTi+b1oNIzURI2zt3dQHXsRdO06n3 -XDqCNwcdIV3Zo31vGxjGCva/q6Mu1N/2hANSmrh/67VCq37/YlmTs3Qli1Xv71H/ -XkVNReHCBLFHpibjrDeQwBcKc7R8w3scZGYh7K6AQpYdA/fV3QpkJEmHp5H2q44J -ZgGAJWT97KB4y8x2tCDDS3ckSOZEJS/y14Ggzo2t9sYvcKwP3p39/YWMh7Ezk3HC -kZj/j0NTu7kQotkvfuyVzBD8n4U8jEB9ioO8qoT5tfib5hmP2SbW25tiH2MjAk+H -9ReR3G0ATYed4vdjOiDucCiKSoD8kLzn90fVwZ2MhrYWvBLXVPQHcp3NEmYRNIx+ -KFxAuOXQpGuBPUBqmOXb -=UvDI +iQJ8BAEBCABmBQJUsQVIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhlUP/0CfRya4tnIxxwfBlaqyC2M8 +NnHU9jynIlwTWPpZoqUKq4YOxx8MnBOa/lJxxx8usqKnfoUXLlkDs/RhoF/DzooW +Anzzm9uFSzRPOoFOScz5zBfdjpfGxf4GinBSs2lFMui72fbmjuRYbQtZnsEqCyvP +WDc85oinEiNK7fYukQN5L5BixDaKRMl/JSqk4w4VFuV0qOuWYpmg1pBLRfHuHWU4 +8NGP1MWfyEnJKly78klmouOefjr40TLFxkBEVOXlqQ7016vO1QnFqcjpgdazOaQI +YDtP4xj+KKLcsbc8yyBfZBx7MUkiw+cXY0im2WHQZr5rHsB3aH1kJv7a7n77i/rS +1THQmpNk6WPlqsqJSxMMkWZCCpPQD77cOg0UN4JjFM5IwlsAu6PHGI6+labEHK3E +ux53/ToEhEjbxJfOOrUcNPGCurNavDtQK6J/dHS/5zOpLGRS/GnwoaGwfvxKoCyp +M5cvrJAwmAgxoT1bwCtZz5CR4Lj0lht/DyLjtNL9aoVWnjk8hbyz7be8Za7ETYox +snPzIa0E0norVuzzfnjgCpa3HC8Vy/orRP3OlUxVKjxFs1JR1R/9iMLYf5hvGY+1 +7scU8KR41Qe45opiUf6pF5JBb4WNZd/VrW3/PaoS7Jwa4NPdGhoZd09UEAPd7A42 +0Eo9ZjuEgGQ0FDjFh2R7 +=lxJ4 -----END PGP SIGNATURE----- diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild b/media-gfx/entangle/entangle-0.6.0.ebuild index 8987b1d8a273..0ab3d0a556f0 100644 --- a/media-gfx/entangle/entangle-0.6.0.ebuild +++ b/media-gfx/entangle/entangle-0.6.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/entangle-0.6.0.ebuild,v 1.1 2014/12/30 19:12:20 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/entangle/entangle-0.6.0.ebuild,v 1.2 2015/01/10 10:56:06 mgorny Exp $ EAPI=5 @@ -17,14 +17,14 @@ IUSE="" DEPEND=">=dev-libs/glib-2.26:2 >=x11-libs/gdk-pixbuf-2.12.0:2 - >=x11-libs/gtk+-3.3.18:3 + >=x11-libs/gtk+-3.3.18:3[introspection] virtual/libgudev:= >=dev-libs/dbus-glib-0.60 >=dev-libs/gobject-introspection-0.9.3 >=media-libs/libgphoto2-2.4.11:= media-libs/lcms:2 >=dev-libs/libpeas-1.2.0[gtk] - >=media-libs/gexiv2-0.4 + >=media-libs/gexiv2-0.4[introspection] >=x11-libs/libXext-1.3.0 >=x11-themes/gnome-icon-theme-symbolic-3.0.0 >=media-libs/libraw-0.9.0" @@ -40,10 +40,3 @@ G2CONF+=" --disable-static" DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - gnome2_src_prepare - - has_version '>=media-libs/libgphoto2-2.5.0' && \ - epatch "${FILESDIR}"/${P}+libgphoto2-2.5.0.patch -} diff --git a/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch b/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch deleted file mode 100644 index 83013be446c4..000000000000 --- a/media-gfx/entangle/files/entangle-0.5.0+libgphoto2-2.5.0.patch +++ /dev/null @@ -1,129 +0,0 @@ -Index: entangle-0.5.0/configure.ac -=================================================================== ---- entangle-0.5.0.orig/configure.ac -+++ entangle-0.5.0/configure.ac -@@ -28,7 +28,7 @@ GDK_PIXBUF_REQUIRED=2.12.0 - AC_SUBST(GDK_PIXBUF_REQUIRED) - GTK_REQUIRED=3.0.0 - AC_SUBST(GTK_REQUIRED) --GPHOTO2_REQUIRED=2.4.11 -+GPHOTO2_REQUIRED=2.5.0 - AC_SUBST(GPHOTO2_REQUIRED) - GUDEV_REQUIRED=145 - AC_SUBST(GUDEV_REQUIRED) -Index: entangle-0.5.0/src/backend/entangle-camera.c -=================================================================== ---- entangle-0.5.0.orig/src/backend/entangle-camera.c -+++ entangle-0.5.0/src/backend/entangle-camera.c -@@ -543,15 +543,14 @@ const char *entangle_camera_get_port(Ent - - static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED, - float target, -- const char *format, -- va_list args, -+ const char *txt, - void *data) - { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; - - if (priv->progress) -- entangle_progress_start(priv->progress, target, format, args); -+ entangle_progress_start(priv->progress, target, txt); - - return 0; /* XXX what is this actually useful for ? */ - } -@@ -588,15 +587,14 @@ static void entangle_camera_reset_last_e - } - - static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED, -- const char *fmt, -- va_list args, -+ const char *txt, - void *data) - { - EntangleCamera *cam = data; - EntangleCameraPrivate *priv = cam->priv; - - entangle_camera_reset_last_error(cam); -- priv->lastError = g_strdup_vprintf(fmt, args); -+ priv->lastError = g_strdup(txt); - ENTANGLE_DEBUG("Got error %s", priv->lastError); - } - -Index: entangle-0.5.0/src/backend/entangle-progress.c -=================================================================== ---- entangle-0.5.0.orig/src/backend/entangle-progress.c -+++ entangle-0.5.0/src/backend/entangle-progress.c -@@ -23,11 +23,11 @@ - #include "entangle-debug.h" - #include "entangle-progress.h" - --void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args) -+void entangle_progress_start(EntangleProgress *prog, float target, const char *txt) - { - g_return_if_fail(ENTANGLE_IS_PROGRESS(prog)); - -- ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, format, args); -+ ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, txt); - } - - void entangle_progress_update(EntangleProgress *prog, float current) -Index: entangle-0.5.0/src/backend/entangle-progress.h -=================================================================== ---- entangle-0.5.0.orig/src/backend/entangle-progress.h -+++ entangle-0.5.0/src/backend/entangle-progress.h -@@ -38,14 +38,14 @@ typedef struct _EntangleProgressInterfac - struct _EntangleProgressInterface { - GTypeInterface parent; - -- void (*start) (EntangleProgress *prog, float target, const char *format, va_list args); -+ void (*start) (EntangleProgress *prog, float target, const char *txt); - void (*update) (EntangleProgress *prog, float current); - void (*stop) (EntangleProgress *prog); - }; - - GType entangle_progress_get_type(void); - --void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args); -+void entangle_progress_start(EntangleProgress *prog, float target, const char *txt); - void entangle_progress_update(EntangleProgress *prog, float current); - void entangle_progress_stop(EntangleProgress *prog); - -Index: entangle-0.5.0/src/frontend/entangle-camera-manager.c -=================================================================== ---- entangle-0.5.0.orig/src/frontend/entangle-camera-manager.c -+++ entangle-0.5.0/src/frontend/entangle-camera-manager.c -@@ -1091,14 +1091,13 @@ static void do_camera_file_preview(Entan - } - - --static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *format, va_list args) -+static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *txt) - { - g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(iface)); - - EntangleCameraManager *manager = ENTANGLE_CAMERA_MANAGER(iface); - EntangleCameraManagerPrivate *priv = manager->priv; - GtkWidget *mtr; -- char *txt; - GtkWidget *operation; - - gdk_threads_enter(); -@@ -1107,16 +1106,12 @@ static void do_entangle_camera_progress_ - mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); - operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation")); - -- txt = g_strdup_vprintf(format, args); -- - gtk_widget_set_tooltip_text(mtr, txt); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mtr), txt); - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mtr), 0); - - gtk_widget_show(operation); - -- g_free(txt); -- - gdk_threads_leave(); - } - -- 2.26.2