From nobody Wed Nov 24 06:51:51 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AFAD3188987D; Wed, 24 Nov 2021 06:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HzWrl6F0gz4rMc; Wed, 24 Nov 2021 06:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A82AE25809; Wed, 24 Nov 2021 06:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AO6ppMW049965; Wed, 24 Nov 2021 06:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO6ppiY049964; Wed, 24 Nov 2021 06:51:51 GMT (envelope-from git) Date: Wed, 24 Nov 2021 06:51:51 GMT Message-Id: <202111240651.1AO6ppiY049964@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 3f6d136d1c10 - main - editors/xmlcopyeditor: update to 1.3.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f6d136d1c1054dcfcbc728fca06d73476112c22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637736712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VG/3b/AWJwnaTw9dR7/dv4y1xS/XsvFIO2rHSrgLCYw=; b=fAb0Ib4Mm6WFNorg7Q6L3WmaZvhfbCTd7l/XQ7i1AO0QgfvfPBsI9F1HQBGQupMJ5ZAhZU WafwWckH2Hy78sOwEwchibdHweci5jXGSL4jCIQGHRBrtGMvyHXaHYUgfaqTaCLVgFStdI 7dX5a8qbfvpLEA8sQYHUZJP476YMKK/jVSPgpJHf1JfsiL0fktHdPz14G0a9bAa1OPz/C7 Ymz2pi1Lgwa1HPlHb3T0T78A4Z+0dRR4yZlZY5JOWU9x64/1fmICKsoIdIE3SJ+oP9rjX/ RtGAZ3oaM/AT50j5yZXsRheJBruj3e9GqUmJdjFctMu1ELZ6+RN5tCkTYSbrfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637736712; a=rsa-sha256; cv=none; b=iCr7Dxjg2u2kNYA3RlEWNJZ4V8twTGEiv10jdCLxAqcjwLyz1ZUqJCAqvPJqtO/qrGTCHY B1zDnHWYZgJX1erM9xRRCavdrMJpswH0S8hGc3/tzfGQ1tifxb3fYLe29giV2WAp1Xoe6g BDSXXlHNXJCCge1RUb9l8FzWuKvDNZ8alejHdDPqjoKK29CBcFGiuy8Y95PVzQAEgJLSgE zP0n5C8g30+mBuos0Dn55+N9YkPCcNM5jqhOgRSHFS+R/kg8NdeMU9ls3YFUln/0Sfefsp PJ7tWrwu32emWnH67qcQH0oprEMcNoFZZL92UnpYCa/2eD1ybaZriN+ZAo/B5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f6d136d1c1054dcfcbc728fca06d73476112c22 commit 3f6d136d1c1054dcfcbc728fca06d73476112c22 Author: Jose G. Juanino AuthorDate: 2021-11-23 16:48:46 +0000 Commit: Fernando Apesteguía CommitDate: 2021-11-24 06:50:46 +0000 editors/xmlcopyeditor: update to 1.3.0.0 ChangeLog: https://sourceforge.net/p/xml-copy-editor/code/ci/master/tree/ChangeLog?format=raw PR: 259680 Reported by: jjuanino@gmail.com (maintainer) --- editors/xmlcopyeditor/Makefile | 31 +++++++++++----------- editors/xmlcopyeditor/distinfo | 5 ++-- .../files/patch-po_Makefile.in.in.diff | 10 ------- .../xmlcopyeditor/files/patch-src_Makefile.in.diff | 11 ++++---- editors/xmlcopyeditor/files/patch-src_myipc.cpp | 11 -------- editors/xmlcopyeditor/pkg-plist | 16 +---------- 6 files changed, 26 insertions(+), 58 deletions(-) diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile index c7f5a76dea68..d66c7370421a 100644 --- a/editors/xmlcopyeditor/Makefile +++ b/editors/xmlcopyeditor/Makefile @@ -1,8 +1,5 @@ -# Created by: José García Juanino - PORTNAME= xmlcopyeditor -PORTVERSION= 1.2.1.3 -PORTREVISION= 17 +PORTVERSION= 1.3.0.0 CATEGORIES= editors MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION} @@ -12,22 +9,26 @@ COMMENT= Fast validating XML editor LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs -LIB_DEPENDS= libxerces-c.so.3:textproc/xerces-c3 \ - libxslt.so:textproc/libxslt \ - libaspell.so:textproc/aspell \ +LIB_DEPENDS= libaspell.so:textproc/aspell \ + libenchant.so:textproc/enchant \ + libexpat.so:textproc/expat2 \ + libharfbuzz.so:print/harfbuzz \ libpcre.so:devel/pcre \ + libxerces-c.so.3:textproc/xerces-c3 \ libxml2.so:textproc/libxml2 \ - libexpat.so:textproc/expat2 + libxslt.so:textproc/libxslt -USES= compiler:c++11-lang dos2unix gettext gmake gnome iconv libtool -USE_WX= 2.8+ -WX_COMPS= wx contrib +USES= autoreconf compiler:c++11-lang desktop-file-utils dos2unix \ + gmake gettext-tools gnome iconv libtool pkgconfig +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 intltool pango +USE_WX= 3.0+ +WX_COMPS= wx WX_CONF_ARGS= absolute -USE_GNOME= intltool GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-nls # NLS does not work properly + +CPPFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/libxml2 -LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB} +WRKSRC= ${WRKDIR}/${PORTNAME} .include diff --git a/editors/xmlcopyeditor/distinfo b/editors/xmlcopyeditor/distinfo index 6d70a5c750ae..66b292cee3ac 100644 --- a/editors/xmlcopyeditor/distinfo +++ b/editors/xmlcopyeditor/distinfo @@ -1,2 +1,3 @@ -SHA256 (xmlcopyeditor-1.2.1.3.tar.gz) = 9b684b5042b4af85d3626fd55108bd1d63c0007b5c794ef7cc4b026012b29d2f -SIZE (xmlcopyeditor-1.2.1.3.tar.gz) = 4266907 +TIMESTAMP = 1636138025 +SHA256 (xmlcopyeditor-1.3.0.0.tar.gz) = 62342d8b30cb0c59f7fd13a107619a2f955e12bb1057ecdf378b449e96ed3452 +SIZE (xmlcopyeditor-1.3.0.0.tar.gz) = 4981894 diff --git a/editors/xmlcopyeditor/files/patch-po_Makefile.in.in.diff b/editors/xmlcopyeditor/files/patch-po_Makefile.in.in.diff deleted file mode 100644 index 80a1d98a5d43..000000000000 --- a/editors/xmlcopyeditor/files/patch-po_Makefile.in.in.diff +++ /dev/null @@ -1,10 +0,0 @@ -+++ po/Makefile.in.in -@@ -34,7 +34,7 @@ - datarootdir = @datarootdir@ - libdir = @libdir@ - DATADIRNAME = @DATADIRNAME@ --itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+itlocaledir = @localedir@ - subdir = po - install_sh = @install_sh@ - # Automake >= 1.8 provides @mkdir_p@. diff --git a/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff index 8dcd697033d5..68915a1e1be7 100644 --- a/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff +++ b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff @@ -1,7 +1,8 @@ -+++ src/Makefile.in -@@ -283,8 +283,8 @@ - # these are the headers for your project - noinst_HEADERS = $(srcdir)/*.h +--- src/Makefile.am.orig 2021-11-05 21:58:53 UTC ++++ src/Makefile.am +@@ -9,8 +9,8 @@ noinst_HEADERS = $(srcdir)/*.h + bin_PROGRAMS = xmlcopyeditor + bindir = ${prefix}/bin xmlcopyeditordir = ${prefix}/share/xmlcopyeditor -pixmapdir = /usr/share/pixmaps -applicationsdir = /usr/share/applications @@ -9,4 +10,4 @@ +applicationsdir = ${prefix}/share/applications # the application source, library search path, and link libraries - xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \ + xmlcopyeditor_SOURCES = aboutdialog.cpp \ diff --git a/editors/xmlcopyeditor/files/patch-src_myipc.cpp b/editors/xmlcopyeditor/files/patch-src_myipc.cpp deleted file mode 100644 index 455ed07d28ee..000000000000 --- a/editors/xmlcopyeditor/files/patch-src_myipc.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/myipc.cpp.orig 2017-09-04 09:59:48 UTC -+++ src/myipc.cpp -@@ -46,7 +46,7 @@ wxConnectionBase *MyServer::OnAcceptConn - - MyServerConnection::MyServerConnection() - : wxConnection() -- , mFrameWnd ( ( wxIntPtr ) NULL ) -+ , mFrameWnd (0) - { - server_connection = this; - } diff --git a/editors/xmlcopyeditor/pkg-plist b/editors/xmlcopyeditor/pkg-plist index c18694cae935..861a85284f7d 100644 --- a/editors/xmlcopyeditor/pkg-plist +++ b/editors/xmlcopyeditor/pkg-plist @@ -1,21 +1,7 @@ bin/xmlcopyeditor man/man1/xmlcopyeditor.1.gz -share/appdata/xmlcopyeditor.appdata.xml share/applications/xmlcopyeditor.desktop -share/locale/ca/LC_MESSAGES/xmlcopyeditor.mo -share/locale/de/LC_MESSAGES/xmlcopyeditor.mo -share/locale/en_US/LC_MESSAGES/xmlcopyeditor.mo -share/locale/es/LC_MESSAGES/xmlcopyeditor.mo -share/locale/fr/LC_MESSAGES/xmlcopyeditor.mo -share/locale/it/LC_MESSAGES/xmlcopyeditor.mo -share/locale/km/LC_MESSAGES/xmlcopyeditor.mo -share/locale/nl/LC_MESSAGES/xmlcopyeditor.mo -share/locale/ru/LC_MESSAGES/xmlcopyeditor.mo -share/locale/sk/LC_MESSAGES/xmlcopyeditor.mo -share/locale/sv/LC_MESSAGES/xmlcopyeditor.mo -share/locale/uk_UA/LC_MESSAGES/xmlcopyeditor.mo -share/locale/zh_CN/LC_MESSAGES/xmlcopyeditor.mo -share/locale/zh_TW/LC_MESSAGES/xmlcopyeditor.mo +share/metainfo/xmlcopyeditor.appdata.xml share/pixmaps/xmlcopyeditor.png %%DATADIR%%/catalog/catalog %%DATADIR%%/dtd/NewsML_1.2.dtd