diff options
Diffstat (limited to 'meta-gpe/recipes-graphics/gpe-scap')
3 files changed, 0 insertions, 94 deletions
diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch deleted file mode 100644 index c976ff4705..0000000000 --- a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From c551dece6768f67b74b508e9c0133320205ef2df Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | Date: Mon, 23 May 2011 15:03:29 +0200 | ||
| 4 | Subject: [PATCH] Fix the ordering of LDADD options to fix a compilation failure. | ||
| 5 | |||
| 6 | "invalid DSO for symbol `XUngrabServer' definition " | ||
| 7 | |||
| 8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 9 | --- | ||
| 10 | src/Makefile.am | 2 +- | ||
| 11 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 14 | index 2fddc98..45bd850 100644 | ||
| 15 | --- a/src/Makefile.am | ||
| 16 | +++ b/src/Makefile.am | ||
| 17 | @@ -6,7 +6,7 @@ INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" \ | ||
| 18 | $(GLADE_CFLAGS) \ | ||
| 19 | -D_GNU_SOURCE | ||
| 20 | |||
| 21 | -LIBS = $(GTK_LIBS) $(GLADE_LIBS) $(XSHAPE_LIBS) | ||
| 22 | +LIBS = -lX11 $(XSHAPE_LIBS) $(GLADE_LIBS) $(GTK_LIBS) | ||
| 23 | |||
| 24 | bin_PROGRAMS = gpe-scap | ||
| 25 | gpe_scap_SOURCES = scr-i18n.h \ | ||
| 26 | -- | ||
| 27 | 1.6.6.1 | ||
| 28 | |||
diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch deleted file mode 100644 index 3cfe5d7240..0000000000 --- a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | diff -uNr gpe-scap-1.4.orig/configure.ac gpe-scap-1.4/configure.ac | ||
| 2 | --- gpe-scap-1.4.orig/configure.ac 2009-03-05 18:53:53.000000000 +0100 | ||
| 3 | +++ gpe-scap-1.4/configure.ac 2012-05-06 10:18:29.348308322 +0200 | ||
| 4 | @@ -24,7 +24,7 @@ | ||
| 5 | AC_SUBST(LDFLAGS) | ||
| 6 | |||
| 7 | dnl libraries | ||
| 8 | -GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.2" | ||
| 9 | +GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.4" | ||
| 10 | PKG_CHECK_MODULES(GTK, $GTK_MODULES) | ||
| 11 | AC_SUBST(GTK_CFLAGS) | ||
| 12 | AC_SUBST(GTK_LIBS) | ||
| 13 | diff -uNr gpe-scap-1.4.orig/src/scr-shot-common.c gpe-scap-1.4/src/scr-shot-common.c | ||
| 14 | --- gpe-scap-1.4.orig/src/scr-shot-common.c 2009-03-05 12:13:20.000000000 +0100 | ||
| 15 | +++ gpe-scap-1.4/src/scr-shot-common.c 2012-05-06 10:30:52.299371576 +0200 | ||
| 16 | @@ -182,12 +182,12 @@ | ||
| 17 | /* create session and message */ | ||
| 18 | session = soup_session_sync_new (); | ||
| 19 | message = soup_message_new ("POST", url); | ||
| 20 | - soup_message_add_header (message->request_headers, "User-Agent", "gpe-scap/" VERSION); | ||
| 21 | - soup_message_add_header (message->request_headers, "Accept", | ||
| 22 | + soup_message_headers_append (message->request_headers, "User-Agent", "gpe-scap/" VERSION); | ||
| 23 | + soup_message_headers_append (message->request_headers, "Accept", | ||
| 24 | "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); | ||
| 25 | -/* soup_message_add_header (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); | ||
| 26 | - soup_message_add_header (message->request_headers, "Keep-Alive", "100"); | ||
| 27 | - soup_message_add_header (message->request_headers, "Connection", "keep-alive"); | ||
| 28 | +/* soup_message_headers_append (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); | ||
| 29 | + soup_message_headers_append (message->request_headers, "Keep-Alive", "100"); | ||
| 30 | + soup_message_headers_append (message->request_headers, "Connection", "keep-alive"); | ||
| 31 | soup_message_wire add_header (message->request_headers, "Accept-Encoding", "gzip,deflate"); | ||
| 32 | */ | ||
| 33 | /* build message body */ | ||
| 34 | @@ -207,7 +207,7 @@ | ||
| 35 | memcpy (body + strlen (cmd) + len, tail, strlen (tail)); | ||
| 36 | |||
| 37 | soup_message_set_request (message, "multipart/form-data; boundary="SEP, | ||
| 38 | - SOUP_BUFFER_SYSTEM_OWNED, body, content_len); | ||
| 39 | + SOUP_MEMORY_TAKE, body, content_len); | ||
| 40 | |||
| 41 | soup_session_send_message (session, message); | ||
| 42 | |||
diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb deleted file mode 100644 index db50e38e3f..0000000000 --- a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | SUMMARY = "A GPE application that allows you to take screenshots" | ||
| 2 | SECTION = "gpe" | ||
| 3 | |||
| 4 | LICENSE = "GPLv2" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
| 6 | |||
| 7 | DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup-2.4" | ||
| 8 | |||
| 9 | PR = "r3" | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "eaf545561b0ad981c9d01833f30fcf95" | ||
| 12 | SRC_URI[sha256sum] = "762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534" | ||
| 13 | |||
| 14 | GPE_TARBALL_SUFFIX = "bz2" | ||
| 15 | |||
| 16 | inherit gpe autotools pkgconfig | ||
| 17 | |||
| 18 | SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch \ | ||
| 19 | file://use.libsoup-2.4.patch \ | ||
| 20 | " | ||
| 21 | |||
| 22 | RREPLACES_${PN} = "gpe-screenshot" | ||
| 23 | |||
| 24 | PNBLACKLIST[gpe-scap] ?= "Depends on blacklisted libgpewidget - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
