From 8665513722caa761391962b8e4dac5f369cfbf19 Mon Sep 17 00:00:00 2001 From: coypu Date: Wed, 27 Jan 2016 21:21:34 +0200 Subject: [PATCH] empathy: broken update to 3.12.10 --- empathy/Makefile | 14 +++++---- empathy/distinfo | 8 ++--- empathy/patches/patch-ad | 15 --------- .../patch-libempathy_empathy-auth-factory.c | 14 --------- empathy/patches/patch-src_Makefile.am | 31 ------------------- empathy/patches/patch-src_Makefile.in | 31 ------------------- 6 files changed, 12 insertions(+), 101 deletions(-) delete mode 100644 empathy/patches/patch-ad delete mode 100644 empathy/patches/patch-libempathy_empathy-auth-factory.c delete mode 100644 empathy/patches/patch-src_Makefile.am delete mode 100644 empathy/patches/patch-src_Makefile.in diff --git a/empathy/Makefile b/empathy/Makefile index 0a99fc5d4c..280b775659 100644 --- a/empathy/Makefile +++ b/empathy/Makefile @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.74 2015/12/05 21:25:30 adam Exp $ -DISTNAME= empathy-2.34.0 -PKGREVISION= 45 +DISTNAME= empathy-3.12.10 CATEGORIES= chat gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/2.34/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/3.12/} +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://live.gnome.org/Empathy @@ -32,12 +32,14 @@ XSLTPROC_PATH+= ${LOCALBASE}/share/doc/dbus # notyet #CONFIGURE_ARGS+= --enable-meego +.include "../../security/libsecret/buildlink3.mk" +.include "../../www/webkit-gtk/buildlink3.mk" .include "../../audio/libcanberra/buildlink3.mk" .include "../../chat/telepathy-farsight/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../chat/telepathy-logger/buildlink3.mk" .include "../../chat/libfolks/buildlink3.mk" -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.6 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/glib2/schemas.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -56,8 +58,8 @@ BUILDLINK_API_DEPENDS.enchant+= enchant>=1.2.0 .include "../../textproc/libxslt/xsltproc-nonet.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0 -.include "../../x11/gtk2/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.9.4 +.include "../../x11/gtk3/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libunique/buildlink3.mk" # notyet diff --git a/empathy/distinfo b/empathy/distinfo index 74b181731d..296b5583ca 100644 --- a/empathy/distinfo +++ b/empathy/distinfo @@ -1,9 +1,9 @@ $NetBSD: distinfo,v 1.13 2015/11/03 01:20:18 agc Exp $ -SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f -RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab -SHA512 (empathy-2.34.0.tar.gz) = 9b6539f645357c9f1f9a4ff5fa0e7511d02163c5433f1439388adbeae96138f66aca4af8078e016fd78c147ba91ef88d342da55e4392486d68f065857ca3775e -Size (empathy-2.34.0.tar.gz) = 5085101 bytes +SHA1 (empathy-3.12.10.tar.xz) = 1de7132ec517e033ba033fa00775fe620a1b2b55 +RMD160 (empathy-3.12.10.tar.xz) = 1f99444129eb32fa0a1bafae96d1bb7a5678a2e6 +SHA512 (empathy-3.12.10.tar.xz) = 59d48316d4708e04cddb395626ac1e8fc55aa215e1bbb79e6976c58c857f08e8a758ccc670a35bd966b95676a2cdd6bc70dd12e3aac85d01e02e995bb6fd6fe2 +Size (empathy-3.12.10.tar.xz) = 5064384 bytes SHA1 (patch-ad) = 2f0df78b7ee7ae3f58610894a6899397a4601ba7 SHA1 (patch-libempathy_empathy-auth-factory.c) = 4f2e4fe7ad4e15bd075c39791248143a5c0f005f SHA1 (patch-src_Makefile.am) = b80be45492abf1a4bf79f4c408f07beb4ee4ed29 diff --git a/empathy/patches/patch-ad b/empathy/patches/patch-ad deleted file mode 100644 index 5348b0213d..0000000000 --- a/empathy/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $ - ---- configure.orig 2011-03-24 15:18:52.000000000 +0000 -+++ configure -@@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem - .SECONDARY: $(gsettings_SCHEMAS) - - gsettings__base_list = \ -- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ -- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" -+ gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ -+ gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" - - install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) - @$(NORMAL_INSTALL) diff --git a/empathy/patches/patch-libempathy_empathy-auth-factory.c b/empathy/patches/patch-libempathy_empathy-auth-factory.c deleted file mode 100644 index 5f6136b104..0000000000 --- a/empathy/patches/patch-libempathy_empathy-auth-factory.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-libempathy_empathy-auth-factory.c,v 1.1 2013/05/04 22:38:14 prlw1 Exp $ - -Needed for use with telepathy-glib-0.20.2 - ---- libempathy/empathy-auth-factory.c.orig 2011-03-24 15:15:16.000000000 +0000 -+++ libempathy/empathy-auth-factory.c -@@ -20,6 +20,7 @@ - - #include "empathy-auth-factory.h" - -+#include - #include - #include - #include diff --git a/empathy/patches/patch-src_Makefile.am b/empathy/patches/patch-src_Makefile.am deleted file mode 100644 index 03de87a18c..0000000000 --- a/empathy/patches/patch-src_Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_Makefile.am,v 1.1 2012/03/20 11:17:49 obache Exp $ - -* remove -enumtypes rules - http://git.gnome.org/browse/empathy/commit/src/Makefile.am?id=2d1cf80cf8ae0412eaf176c557f78f29ab8d4064 - ---- src/Makefile.am.orig 2011-03-24 15:15:16.000000000 +0000 -+++ src/Makefile.am -@@ -274,23 +274,5 @@ src-marshal.list: $(empathy_SOURCES) Mak - $(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c - --# rules for making the glib enum objects --%-enumtypes.h: %.h Makefile.in -- $(AM_V_GEN)glib-mkenums \ -- --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ -- --fprod "/* enumerations from \"@filename@\" */\n" \ -- --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ -- --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ -- $< > $@ -- --%-enumtypes.c: %.h Makefile.in -- $(AM_V_GEN)glib-mkenums \ -- --fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \ -- --fprod "\n/* enumerations from \"@filename@\" */" \ -- --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \ -- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ -- $< > $@ -- - CLEANFILES = $(BUILT_SOURCES) - diff --git a/empathy/patches/patch-src_Makefile.in b/empathy/patches/patch-src_Makefile.in deleted file mode 100644 index 26d165002f..0000000000 --- a/empathy/patches/patch-src_Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2012/03/20 11:17:49 obache Exp $ - -* refrect changes from Makefile.am - ---- src/Makefile.in.orig 2011-03-24 15:18:54.000000000 +0000 -+++ src/Makefile.in -@@ -1688,24 +1688,6 @@ src-marshal.list: $(empathy_SOURCES) Mak - $(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c - --# rules for making the glib enum objects --%-enumtypes.h: %.h Makefile.in -- $(AM_V_GEN)glib-mkenums \ -- --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ -- --fprod "/* enumerations from \"@filename@\" */\n" \ -- --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ -- --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ -- $< > $@ -- --%-enumtypes.c: %.h Makefile.in -- $(AM_V_GEN)glib-mkenums \ -- --fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \ -- --fprod "\n/* enumerations from \"@filename@\" */" \ -- --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \ -- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ -- $< > $@ -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: