From 06438c23bc698aea28a527a2dafd6d830dd70bb3 Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Mon, 6 Mar 2017 14:39:30 +0300 Subject: [PATCH] drivel: fix build after libsoup update --- components/{ => editor}/drivel/Makefile | 31 +++++++++++---- components/{ => editor}/drivel/drivel.p5m | 8 ++-- .../drivel/manifests/sample-manifest.p5m | 0 components/editor/drivel/patches/01-libsoup.patch | 45 ++++++++++++++++++++++ 4 files changed, 72 insertions(+), 12 deletions(-) rename components/{ => editor}/drivel/Makefile (55%) rename components/{ => editor}/drivel/drivel.p5m (95%) rename components/{ => editor}/drivel/manifests/sample-manifest.p5m (100%) create mode 100644 components/editor/drivel/patches/01-libsoup.patch diff --git a/components/drivel/Makefile b/components/editor/drivel/Makefile similarity index 55% rename from components/drivel/Makefile rename to components/editor/drivel/Makefile index d7d789ac0..8b0dd1a46 100644 --- a/components/drivel/Makefile +++ b/components/editor/drivel/Makefile @@ -9,13 +9,14 @@ # # -# Copyright (c) 2014 Alexander Pyhalov +# Copyright 2017 Alexander Pyhalov # -include ../../make-rules/shared-macros.mk +include ../../../make-rules/shared-macros.mk COMPONENT_NAME= drivel COMPONENT_VERSION= 3.0.5 +COMPONENT_REVISION= 1 COMPONENT_PROJECT_URL= http://drivel.sourceforge.net/ COMPONENT_SUMMARY= Drivel is a GNOME client for editing blog COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) @@ -23,10 +24,14 @@ COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ sha256:71b4af2552c22124a20e0b40958103f41beb3cb591b7b7e0c184e2817554a3fb COMPONENT_ARCHIVE_URL= http://prdownloads.sourceforge.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) +COMPONENT_FMRI= editor/blog/drivel +COMPONENT_CLASSIFICATION= Applications/Internet +COMPONENT_LICENSE_FILE= COPYING +COMPONENT_LICENSE= GPLv2 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH=/usr/gnu/bin:/usr/bin @@ -44,6 +49,16 @@ install: $(INSTALL_32) test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += gnome/config/gconf +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/gtksourceview +REQUIRED_PACKAGES += library/desktop/gtkspell +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/gnome/gnome-vfs +REQUIRED_PACKAGES += library/libsoup +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libdbus-glib +REQUIRED_PACKAGES += system/library/math diff --git a/components/drivel/drivel.p5m b/components/editor/drivel/drivel.p5m similarity index 95% rename from components/drivel/drivel.p5m rename to components/editor/drivel/drivel.p5m index 160d640f1..560aa66ec 100644 --- a/components/drivel/drivel.p5m +++ b/components/editor/drivel/drivel.p5m @@ -9,17 +9,17 @@ # # -# Copyright 2014 Alexander Pyhalov. All rights reserved. +# Copyright 2017 Alexander Pyhalov # -set name=pkg.fmri value=pkg:/editor/blog/drivel@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" -set name=info.classification value="org.opensolaris.category.2008:Applications/Internet" +set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -license COPYING license='GPLv2' +license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' default restart_fmri svc:/application/desktop-cache/gconf-cache:default> default restart_fmri svc:/application/desktop-cache/desktop-mime-cache:default> diff --git a/components/drivel/manifests/sample-manifest.p5m b/components/editor/drivel/manifests/sample-manifest.p5m similarity index 100% rename from components/drivel/manifests/sample-manifest.p5m rename to components/editor/drivel/manifests/sample-manifest.p5m diff --git a/components/editor/drivel/patches/01-libsoup.patch b/components/editor/drivel/patches/01-libsoup.patch new file mode 100644 index 000000000..73edf8d56 --- /dev/null +++ b/components/editor/drivel/patches/01-libsoup.patch @@ -0,0 +1,45 @@ +diff -wbBur drivel-3.0.5/src/soup-xmlrpc-message.c drivel-3.0.5.my/src/soup-xmlrpc-message.c +--- drivel-3.0.5/src/soup-xmlrpc-message.c 2011-04-15 21:54:16.000000000 +0400 ++++ drivel-3.0.5.my/src/soup-xmlrpc-message.c 2016-07-26 15:54:32.676453746 +0300 +@@ -60,7 +60,7 @@ + + + SoupXmlrpcMessage * +-soup_xmlrpc_message_new (const char *uri_string) ++_soup_xmlrpc_message_new (const char *uri_string) + { + SoupXmlrpcMessage *msg; + SoupURI *uri; +diff -wbBur drivel-3.0.5/src/soup-xmlrpc-message.h drivel-3.0.5.my/src/soup-xmlrpc-message.h +--- drivel-3.0.5/src/soup-xmlrpc-message.h 2011-04-15 21:54:16.000000000 +0400 ++++ drivel-3.0.5.my/src/soup-xmlrpc-message.h 2016-07-26 15:54:21.019787214 +0300 +@@ -33,7 +33,7 @@ + + GType soup_xmlrpc_message_get_type (void); + +-SoupXmlrpcMessage *soup_xmlrpc_message_new (const char *uri_string); ++SoupXmlrpcMessage *_soup_xmlrpc_message_new (const char *uri_string); + SoupXmlrpcMessage *soup_xmlrpc_message_new_from_uri (SoupURI *uri); + + void soup_xmlrpc_message_start_call (SoupXmlrpcMessage *msg, +diff -wbBur drivel-3.0.5/src/xmlrpc.c drivel-3.0.5.my/src/xmlrpc.c +--- drivel-3.0.5/src/xmlrpc.c 2011-04-15 21:54:16.000000000 +0400 ++++ drivel-3.0.5.my/src/xmlrpc.c 2016-07-26 15:54:45.196453603 +0300 +@@ -37,7 +37,7 @@ + { + SoupXmlrpcMessage *msg; + +- msg = soup_xmlrpc_message_new (uri); ++ msg = _soup_xmlrpc_message_new (uri); + soup_xmlrpc_message_start_call (msg, name); + + return (msg); +@@ -48,7 +48,7 @@ + { + SoupXmlrpcMessage *msg; + +- msg = soup_xmlrpc_message_new (uri); ++ msg = _soup_xmlrpc_message_new (uri); + soup_xmlrpc_message_start_call (msg, name); + soup_xmlrpc_message_start_param (msg); + soup_xmlrpc_message_start_struct (msg); -- 2.11.4.GIT