From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RymQK-00023q-CN for garchives@archives.gentoo.org; Sat, 18 Feb 2012 15:42:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FFC0E0E4E; Sat, 18 Feb 2012 15:41:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26BEAE0E4E for ; Sat, 18 Feb 2012 15:41:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D2F31B4004 for ; Sat, 18 Feb 2012 15:41:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 18CD5E5400 for ; Sat, 18 Feb 2012 15:41:53 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1329579692.8145c99e22a4068e58ebbc878e9e2bceacf2f770.nirbheek@gentoo> Subject: [gentoo-commits] dev/nirbheek:master commit in: gnome-extra/gnome-utils/files/, gnome-extra/gnome-utils/ X-VCS-Repository: dev/nirbheek X-VCS-Files: gnome-extra/gnome-utils/Manifest gnome-extra/gnome-utils/files/0001-New-feature-uploading-screenshots-to-imgur.com.patch gnome-extra/gnome-utils/files/gnome-utils-3.2.1-upload-screenshots.patch gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild X-VCS-Directories: gnome-extra/gnome-utils/files/ gnome-extra/gnome-utils/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 8145c99e22a4068e58ebbc878e9e2bceacf2f770 X-VCS-Branch: master Date: Sat, 18 Feb 2012 15:41:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c7e8f5f2-8de2-4255-9835-069b84b2eb72 X-Archives-Hash: f2a915a64dc951fc8f74601180c1edb1 commit: 8145c99e22a4068e58ebbc878e9e2bceacf2f770 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Feb 18 15:05:18 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Feb 18 15:41:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/nirbheek.git;a= =3Dcommit;h=3D8145c99e Brown-paper-bag fix Just because it's your own damn overlay doesn't mean you don't test shit before pushing. --- gnome-extra/gnome-utils/Manifest | 4 +- ... =3D> gnome-utils-3.2.1-upload-screenshots.patch} | 175 ++++++++----= -------- gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild | 12 +- 3 files changed, 84 insertions(+), 107 deletions(-) diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/M= anifest index da0096c..5631d47 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -1,3 +1,3 @@ -AUX 0001-New-feature-uploading-screenshots-to-imgur.com.patch 13173 RMD1= 60 0fbbce42e9d3c95ac57be4fb41e4b866c9321e11 SHA1 9a9a309b08a7ac5e2b6fabcf= b62153bf2e43e4e3 SHA256 0b0ac89f3cc8cd5cfde6686b0f51ee6d922ed6d48ad9ea3fd= 709b3a2e706f01f +AUX gnome-utils-3.2.1-upload-screenshots.patch 13009 RMD160 8121d8052f98= f8f285555ff9f16da7e113cd0968 SHA1 5a23536030b04725caa4a1ac45f98ae9f953109= 0 SHA256 13807ea2e9ae6cb7228a57d9100dfa803d3ba29f7c17428464e8375af54f1d12 DIST gnome-utils-3.2.1.tar.xz 7273572 RMD160 a0e34b7057c0b77b58f7310ec8a= 8a3af238071bd SHA1 2f837a420ea73ad1a1cab56656b450e704f2faab SHA256 3ac194= 2dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328 -EBUILD gnome-utils-3.2.1.ebuild 2095 RMD160 20f9254a7db4e63e6e79fe8c5480= d51c99d3d11b SHA1 ba6c630ddb8552e976234c371bd7060c5bf3b466 SHA256 7ae9c7a= 83af42c259f3f81c8415e763dca9d0804caaa06babeb87ed0645be934 +EBUILD gnome-utils-3.2.1.ebuild 2297 RMD160 a435cfdf9a8d269c2f6c713eac0e= d4f300714245 SHA1 9f44b9dbfccb55331430463f03763c21e53d57e9 SHA256 a1f628e= b2d10e1925292f4fcc6babadcd3b16565f63df8b2bcb2295e9a146f7d diff --git a/gnome-extra/gnome-utils/files/0001-New-feature-uploading-scr= eenshots-to-imgur.com.patch b/gnome-extra/gnome-utils/files/gnome-utils-3= .2.1-upload-screenshots.patch similarity index 75% rename from gnome-extra/gnome-utils/files/0001-New-feature-uploading-scre= enshots-to-imgur.com.patch rename to gnome-extra/gnome-utils/files/gnome-utils-3.2.1-upload-screensh= ots.patch index 7fb0ec7..4267108 100644 --- a/gnome-extra/gnome-utils/files/0001-New-feature-uploading-screenshot= s-to-imgur.com.patch +++ b/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-upload-screenshots.= patch @@ -1,26 +1,7 @@ -From 2cc75e214336b858a6e634bb109592dc712f9cd7 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Sat, 18 Feb 2012 20:03:53 +0530 -Subject: [PATCH] New feature: uploading screenshots to imgur.com - ---- - configure.ac | 9 ++ - gnome-screenshot/Makefile.am | 6 ++ - gnome-screenshot/gnome-screenshot.c | 12 +++ - gnome-screenshot/gnome-screenshot.ui | 18 ++++ - gnome-screenshot/screenshot-dialog.c | 11 --- - gnome-screenshot/screenshot-dialog.h | 12 +++ - gnome-screenshot/screenshot-share.c | 155 +++++++++++++++++++++++++++= +++++++ - gnome-screenshot/screenshot-share.h | 32 +++++++ - 8 files changed, 244 insertions(+), 11 deletions(-) - create mode 100644 gnome-screenshot/screenshot-share.c - create mode 100644 gnome-screenshot/screenshot-share.h - -diff --git a/configure.ac b/configure.ac -index d75bbe2..93b54f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,6 +142,15 @@ AS_IF([test "x$GCONFTOOL" =3D "xno"], +diff -Naur gnome-utils-3.2.1//configure.ac gnome-utils-3.2.1.new//config= ure.ac +--- gnome-utils-3.2.1//configure.ac 2011-10-17 19:44:53.000000000 +0530 ++++ gnome-utils-3.2.1.new//configure.ac 2012-02-18 20:23:01.776675767 +0= 530 +@@ -142,6 +142,15 @@ [AC_MSG_ERROR([gconftool-2 executable not found in your path - sh= ould be installed with GConf])] ) =20 @@ -36,56 +17,24 @@ index d75bbe2..93b54f0 100644 # Baobab checks PKG_CHECK_MODULES([LIBGTOP], [libgtop-2.0 >=3D $LIBGTOP_REQUIRED]) AC_SUBST(LIBGTOP_CFLAGS) -diff --git a/gnome-screenshot/Makefile.am b/gnome-screenshot/Makefile.am -index d9a11c7..3be0074 100644 ---- a/gnome-screenshot/Makefile.am -+++ b/gnome-screenshot/Makefile.am -@@ -28,6 +28,8 @@ gnome_screenshot_SOURCES =3D \ - screenshot-interactive-dialog.h \ - screenshot-shadow.c \ - screenshot-shadow.h \ -+ screenshot-share.c \ -+ screenshot-share.h \ - screenshot-utils.c \ - screenshot-utils.h \ - $(NULL) -@@ -36,6 +38,8 @@ gnome_screenshot_CFLAGS =3D \ - $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ - $(LIBCANBERRA_GTK_CFLAGS) \ -+ $(LIBSOUP_CFLAGS) \ -+ $(JSON_GLIB_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(GTK_CFLAGS) \ - $(NULL) -@@ -47,6 +51,8 @@ gnome_screenshot_LDADD =3D \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(LIBCANBERRA_GTK_LIBS) \ -+ $(LIBSOUP_LIBS) \ -+ $(JSON_GLIB_LIBS) \ - $(GTHREAD_LIBS) \ - $(GTK_LIBS) \ - -lm \ -diff --git a/gnome-screenshot/gnome-screenshot.c b/gnome-screenshot/gnom= e-screenshot.c -index 3390914..714b2d1 100644 ---- a/gnome-screenshot/gnome-screenshot.c -+++ b/gnome-screenshot/gnome-screenshot.c +diff -Naur gnome-utils-3.2.1//gnome-screenshot/gnome-screenshot.c gnome-= utils-3.2.1.new//gnome-screenshot/gnome-screenshot.c +--- gnome-utils-3.2.1//gnome-screenshot/gnome-screenshot.c 2011-10-17 19= :40:18.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/gnome-screenshot.c 2012-02-1= 8 20:29:34.978650924 +0530 @@ -1,4 +1,5 @@ /* gnome-screenshot.c - Take a screenshot of the desktop + * vim: set sts=3D2 sw=3D2 et : * * Copyright (C) 2001 Jonathan Blandford * Copyright (C) 2006 Emmanuele Bassi -@@ -47,6 +48,7 @@ - #include "screenshot-filename-builder.h" - #include "screenshot-interactive-dialog.h" +@@ -42,6 +43,7 @@ + #include +=20 #include "screenshot-shadow.h" +#include "screenshot-share.h" #include "screenshot-utils.h" + #include "screenshot-save.h" #include "screenshot-dialog.h" - #include "cheese-flash.h" -@@ -260,6 +262,13 @@ screenshot_save_to_clipboard (void) +@@ -722,6 +724,13 @@ } =20 static void @@ -99,20 +48,20 @@ index 3390914..714b2d1 100644 screenshot_dialog_response_cb (GtkDialog *d, gint response_id, ScreenshotDialog *dialog) -@@ -275,6 +284,9 @@ screenshot_dialog_response_cb (GtkDialog *d, - case SCREENSHOT_RESPONSE_COPY: - screenshot_save_to_clipboard (); - break; -+ case SCREENSHOT_RESPONSE_UPLOAD: +@@ -745,6 +754,10 @@ + try_to_save (dialog); + } + } ++ else if (response_id =3D=3D SCREENSHOT_RESPONSE_UPLOAD) ++ { + screenshot_upload (dialog); -+ break; - default: - gtk_widget_destroy (GTK_WIDGET (d)); - gtk_main_quit (); -diff --git a/gnome-screenshot/gnome-screenshot.ui b/gnome-screenshot/gno= me-screenshot.ui -index 62f1265..6ce9612 100644 ---- a/gnome-screenshot/gnome-screenshot.ui -+++ b/gnome-screenshot/gnome-screenshot.ui ++ } + else if (response_id =3D=3D SCREENSHOT_RESPONSE_COPY) + { + GtkClipboard *clipboard; +diff -Naur gnome-utils-3.2.1//gnome-screenshot/gnome-screenshot.ui gnome= -utils-3.2.1.new//gnome-screenshot/gnome-screenshot.ui +--- gnome-utils-3.2.1//gnome-screenshot/gnome-screenshot.ui 2011-09-28 0= 2:57:36.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/gnome-screenshot.ui 2012-02-= 18 20:23:01.779675766 +0530 @@ -42,6 +42,23 @@ @@ -145,12 +94,41 @@ index 62f1265..6ce9612 100644 -diff --git a/gnome-screenshot/screenshot-dialog.c b/gnome-screenshot/scr= eenshot-dialog.c -index d6d954d..6cb8bba 100644 ---- a/gnome-screenshot/screenshot-dialog.c -+++ b/gnome-screenshot/screenshot-dialog.c -@@ -36,17 +36,6 @@ static GtkTargetEntry drag_types[] =3D - { "image/png", 0, TYPE_IMAGE_PNG }, +diff -Naur gnome-utils-3.2.1//gnome-screenshot/Makefile.am gnome-utils-3= .2.1.new//gnome-screenshot/Makefile.am +--- gnome-utils-3.2.1//gnome-screenshot/Makefile.am 2011-10-17 19:35:06.= 000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/Makefile.am 2012-02-18 20:23= :01.777675767 +0530 +@@ -19,6 +19,8 @@ + screenshot-dialog.h \ + screenshot-shadow.c \ + screenshot-shadow.h \ ++ screenshot-share.c \ ++ screenshot-share.h \ + screenshot-utils.c \ + screenshot-utils.h \ + screenshot-save.c \ +@@ -29,6 +31,8 @@ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(LIBCANBERRA_GTK_CFLAGS) \ ++ $(LIBSOUP_CFLAGS) \ ++ $(JSON_GLIB_CFLAGS) \ + $(GTHREAD_CFLAGS) \ + $(GTK_CFLAGS) \ + $(NULL) +@@ -40,6 +44,8 @@ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(LIBCANBERRA_GTK_LIBS) \ ++ $(LIBSOUP_LIBS) \ ++ $(JSON_GLIB_LIBS) \ + $(GTHREAD_LIBS) \ + $(GTK_LIBS) \ + -lm \ +diff -Naur gnome-utils-3.2.1//gnome-screenshot/screenshot-dialog.c gnome= -utils-3.2.1.new//gnome-screenshot/screenshot-dialog.c +--- gnome-utils-3.2.1//gnome-screenshot/screenshot-dialog.c 2011-10-17 1= 9:35:06.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/screenshot-dialog.c 2012-02-= 18 20:23:01.779675766 +0530 +@@ -39,17 +39,6 @@ + { "text/uri-list", 0, TYPE_TEXT_URI_LIST }, }; =20 -struct ScreenshotDialog @@ -167,10 +145,9 @@ index d6d954d..6cb8bba 100644 static void on_preview_draw (GtkWidget *drawing_area, cairo_t *cr, -diff --git a/gnome-screenshot/screenshot-dialog.h b/gnome-screenshot/scr= eenshot-dialog.h -index 7741198..8f2cff7 100644 ---- a/gnome-screenshot/screenshot-dialog.h -+++ b/gnome-screenshot/screenshot-dialog.h +diff -Naur gnome-utils-3.2.1//gnome-screenshot/screenshot-dialog.h gnome= -utils-3.2.1.new//gnome-screenshot/screenshot-dialog.h +--- gnome-utils-3.2.1//gnome-screenshot/screenshot-dialog.h 2011-10-17 1= 9:35:06.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/screenshot-dialog.h 2012-02-= 18 20:23:01.780675765 +0530 @@ -22,10 +22,22 @@ =20 #include @@ -193,13 +170,11 @@ index 7741198..8f2cff7 100644 +#define SCREENSHOT_RESPONSE_UPLOAD 2 =20 ScreenshotDialog *screenshot_dialog_new (GdkPixbuf *scr= eenshot, - char *initial_uri); -diff --git a/gnome-screenshot/screenshot-share.c b/gnome-screenshot/scre= enshot-share.c -new file mode 100644 -index 0000000..2442cfa ---- /dev/null -+++ b/gnome-screenshot/screenshot-share.c -@@ -0,0 +1,155 @@ + char *initial_uri, +diff -Naur gnome-utils-3.2.1//gnome-screenshot/screenshot-share.c gnome-= utils-3.2.1.new//gnome-screenshot/screenshot-share.c +--- gnome-utils-3.2.1//gnome-screenshot/screenshot-share.c 1970-01-01 05= :30:00.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/screenshot-share.c 2012-02-1= 8 20:23:01.780675765 +0530 +@@ -0,0 +1,156 @@ +/* screenshot-share.c - online screenshot sharing + * vim: set sts=3D2 sw=3D2 et : + * @@ -220,13 +195,14 @@ index 0000000..2442cfa + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + */ + ++#include ++ +#include +#include +#include +#include +#include + -+#include "gnome-screenshot.h" +#include "screenshot-share.h" +#include "screenshot-dialog.h" + @@ -355,11 +331,9 @@ index 0000000..2442cfa + g_app_info_launch_default_for_uri (image_uri, NULL, NULL); + g_app_info_launch_default_for_uri (delete_uri, NULL, NULL); +} -diff --git a/gnome-screenshot/screenshot-share.h b/gnome-screenshot/scre= enshot-share.h -new file mode 100644 -index 0000000..6d39220 ---- /dev/null -+++ b/gnome-screenshot/screenshot-share.h +diff -Naur gnome-utils-3.2.1//gnome-screenshot/screenshot-share.h gnome-= utils-3.2.1.new//gnome-screenshot/screenshot-share.h +--- gnome-utils-3.2.1//gnome-screenshot/screenshot-share.h 1970-01-01 05= :30:00.000000000 +0530 ++++ gnome-utils-3.2.1.new//gnome-screenshot/screenshot-share.h 2012-02-1= 8 20:23:01.780675765 +0530 @@ -0,0 +1,32 @@ +/* screenshot-share.h - online screenshot sharing + * vim: set sts=3D2 sw=3D2 et : @@ -393,6 +367,3 @@ index 0000000..6d39220 +G_END_DECLS + +#endif /* __SCREENSHOT_SHARE_H__ */ ---=20 -1.7.3.4 - diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-ext= ra/gnome-utils/gnome-utils-3.2.1.ebuild index 1f7c7cb..3c4eb9a 100644 --- a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild +++ b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 +inherit autotools gnome2 =20 DESCRIPTION=3D"Utilities for the Gnome desktop" HOMEPAGE=3D"http://www.gnome.org/" @@ -22,7 +22,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.29.14:2 >=3Dgnome-base/gconf-2:2 >=3Dgnome-base/gsettings-desktop-schemas-0.1.0 >=3Dgnome-base/libgtop-2.12:2 + >=3Ddev-libs/json-glib-0.14 >=3Dmedia-libs/libcanberra-0.26-r2[gtk3] + net-libs/libsoup:2.4 x11-libs/libXext x11-libs/libX11" =20 @@ -56,13 +58,14 @@ pkg_setup() { } =20 src_prepare() { - gnome2_src_prepare - # Remove idiotic -D.*DISABLE_DEPRECATED cflags # This method is kinda prone to breakage. Recheck carefully with next b= ump. # bug 339074 find . -iname 'Makefile.am' -exec \ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" + # The above sed breaks this am fil: + sed -e 's/\(INCLUDES.*\)\\/\1/' \ + -i gsearchtool/libgnomeui-deprecated/Makefile.am || die # Do Makefile.in after Makefile.am to avoid automake maintainer-mode find . -iname 'Makefile.in' -exec \ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" @@ -73,4 +76,7 @@ src_prepare() { =20 # New feature, upload screenshots to imgur! epatch "${FILESDIR}"/*.patch + + eautoreconf + gnome2_src_prepare }