From 48c8a9d905a13bb0ddafcd4b98ab55b59f1414db Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 27 Feb 2020 09:20:34 +0000 Subject: - Update to 0.1.0 - Remove unneeded patch Submitted by: Philip Brown (private email) --- net-im/dino/Makefile | 39 ++++++++++++---------- net-im/dino/distinfo | 6 ++-- net-im/dino/files/patch-nwhitehorn-dino.diff | 50 ---------------------------- net-im/dino/pkg-plist | 22 ++++++++---- 4 files changed, 40 insertions(+), 77 deletions(-) delete mode 100644 net-im/dino/files/patch-nwhitehorn-dino.diff (limited to 'net-im/dino') diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile index 3ee7676f65cd..312818276734 100644 --- a/net-im/dino/Makefile +++ b/net-im/dino/Makefile @@ -1,51 +1,54 @@ # $FreeBSD$ -PORTNAME= dino -PORTVERSION= 0.0.20190220 -PORTREVISION= 2 -CATEGORIES= net-im +PORTNAME= dino +DISTVERSIONPREFIX= v +DISTVERSION= 0.1.0 +CATEGORIES= net-im -MAINTAINER= ashish@FreeBSD.org -COMMENT= Modern XMPP Chat Client using GTK+/Vala +MAINTAINER= ashish@FreeBSD.org +COMMENT= Modern XMPP Chat Client using GTK+/Vala -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= vala:lang/vala LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libgee-0.8.so:devel/libgee \ libicuuc.so:devel/icu \ - libsoup-2.4.so:devel/libsoup - -OPTIONS_DEFINE= OMEMO UPLOAD GNUPG -OPTIONS_DEFAULT= OMEMO UPLOAD GNUPG -OPTIONS_SUB= yes + libsoup-2.4.so:devel/libsoup \ + libassuan.so:security/libassuan \ + libgpg-error.so:security/libgpg-error USES= cmake desktop-file-utils gettext-tools gnome \ ninja pkgconfig USE_GITHUB= yes -GH_TAGNAME= 6de86c27 + +OPTIONS_DEFINE= OMEMO UPLOAD GNUPG +OPTIONS_DEFAULT= OMEMO UPLOAD GNUPG +OPTIONS_SUB= yes + HAS_CONFIGURE= yes CONFIGURE_ENV= SHARED_SIGNAL_PROTOCOL=yes LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -Wl,--export-dynamic +USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= cairo gdkpixbuf2 glib20 gnomeprefix gtk30 intlhack -OMEMO_DESC= OMEMO plugin -UPLOAD_DESC= HTTP file upload plugin +OMEMO_DESC= OMEMO plugin +UPLOAD_DESC= HTTP file upload plugin OMEMO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libqrencode.so:graphics/libqrencode \ libsignal-protocol-c.so:net/libsignal OMEMO_VARS= ENABLED_PLUGINS+=omemo -OMEMO_VARS_OFF= DISABLED_PLUGINS+=omemo +OMEMO_VARS_OFF= DISABLED_PLUGINS+=omemo UPLOAD_VARS= ENABLED_PLUGINS+=http-files UPLOAD_VARS_OFF= DISABLED_PLUGINS+=http-files GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme GNUPG_VARS= ENABLED_PLUGINS+=openpgp -GNUPG_VARS_OFF= DISABLED_PLUGINS+=openpgp +GNUPG_VARS_OFF= DISABLED_PLUGINS+=openpgp CMAKE_ARGS+= -DENABLED_PLUGINS="${ENABLED_PLUGINS:S/ /;/gW}" CMAKE_ARGS+= -DDISABLED_PLUGINS="${DISABLED_PLUGINS:S/ /;/gW}" diff --git a/net-im/dino/distinfo b/net-im/dino/distinfo index 2ff38ee01828..bbaa32a426c7 100644 --- a/net-im/dino/distinfo +++ b/net-im/dino/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550952485 -SHA256 (dino-dino-0.0.20190220-6de86c27_GH0.tar.gz) = 5fffbf2c855955da791a56e1f8df5b8f29d36480849642d26ddebaee5669d457 -SIZE (dino-dino-0.0.20190220-6de86c27_GH0.tar.gz) = 349007 +TIMESTAMP = 1581864392 +SHA256 (dino-dino-v0.1.0_GH0.tar.gz) = 202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d +SIZE (dino-dino-v0.1.0_GH0.tar.gz) = 442456 diff --git a/net-im/dino/files/patch-nwhitehorn-dino.diff b/net-im/dino/files/patch-nwhitehorn-dino.diff deleted file mode 100644 index c288f5713260..000000000000 --- a/net-im/dino/files/patch-nwhitehorn-dino.diff +++ /dev/null @@ -1,50 +0,0 @@ - -Source: http://people.freebsd.org/~nwhitehorn/dino.diff - https://github.com/dino/dino/issues/344 - - -Index: plugins/gpgme-vala/CMakeLists.txt -=================================================================== ---- plugins/gpgme-vala/CMakeLists.txt (revision 338) -+++ plugins/gpgme-vala/CMakeLists.txt (working copy) -@@ -47,6 +47,6 @@ - add_definitions(${CFLAGS}) - add_library(gpgme-vala ${GPGME_VALA_C} src/gpgme_fix.c) - add_dependencies(gpgme-vala gpgme-vapi) --target_link_libraries(gpgme-vala ${GPGME_VALA_PACKAGES} gpgme) -+target_link_libraries(gpgme-vala ${GPGME_VALA_PACKAGES} ${GPGME_LIBRARY}) - set_property(TARGET gpgme-vala PROPERTY POSITION_INDEPENDENT_CODE ON) - -Index: plugins/omemo/CMakeLists.txt -=================================================================== ---- plugins/omemo/CMakeLists.txt (revision 338) -+++ plugins/omemo/CMakeLists.txt (working copy) -@@ -58,7 +58,7 @@ - add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\") - add_library(omemo SHARED ${OMEMO_VALA_C} ${OMEMO_GRESOURCES_TARGET}) - add_dependencies(omemo ${GETTEXT_PACKAGE}-translations) --target_link_libraries(omemo libdino signal-protocol-vala ${OMEMO_PACKAGES}) -+target_link_libraries(omemo libdino signal-protocol-vala ${OMEMO_PACKAGES} ${GCrypt_LIBRARY}) - set_target_properties(omemo PROPERTIES PREFIX "") - set_target_properties(omemo PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/) - -Index: plugins/signal-protocol/CMakeLists.txt -=================================================================== ---- plugins/signal-protocol/CMakeLists.txt (revision 338) -+++ plugins/signal-protocol/CMakeLists.txt (working copy) -@@ -105,7 +105,7 @@ - add_definitions(${CFLAGS}) - add_library(signal-protocol-vala ${SIGNAL_PROTOCOL_VALA_C} ${CMAKE_CURRENT_SOURCE_DIR}/src/signal_helper.c) - add_dependencies(signal-protocol-vala signal-protocol-vapi) --target_link_libraries(signal-protocol-vala ${SIGNAL_PROTOCOL_PACKAGES} gcrypt signal-protocol-c m) -+target_link_libraries(signal-protocol-vala ${SIGNAL_PROTOCOL_PACKAGES} ${GCrypt_LIBRARY} signal-protocol-c m) - set_property(TARGET signal-protocol-vala PROPERTY POSITION_INDEPENDENT_CODE ON) - - if(BUILD_TESTS) -@@ -129,4 +129,4 @@ - add_executable(signal-protocol-vala-test ${SIGNAL_TEST_VALA_C}) - add_dependencies(signal-protocol-vala-test signal-protocol-vala) - target_link_libraries(signal-protocol-vala-test signal-protocol-vala ${SIGNAL_PROTOCOL_PACKAGES}) --endif(BUILD_TESTS) -\ No newline at end of file -+endif(BUILD_TESTS) diff --git a/net-im/dino/pkg-plist b/net-im/dino/pkg-plist index 40f673c88c75..6f6b670ed272 100644 --- a/net-im/dino/pkg-plist +++ b/net-im/dino/pkg-plist @@ -46,6 +46,8 @@ share/locale/es/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/eu/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/eu/LC_MESSAGES/dino-openpgp.mo share/locale/eu/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/fi/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/fi/LC_MESSAGES/dino-openpgp.mo share/locale/fi/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/fr/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/fr/LC_MESSAGES/dino-openpgp.mo @@ -59,6 +61,8 @@ share/locale/hu/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/it/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/it/LC_MESSAGES/dino-openpgp.mo share/locale/it/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/ja/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/ja/LC_MESSAGES/dino-openpgp.mo share/locale/ja/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/lb/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/lb/LC_MESSAGES/dino-openpgp.mo @@ -72,9 +76,12 @@ share/locale/nl/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/nl_BE/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/nl_BE/LC_MESSAGES/dino-openpgp.mo share/locale/nl_BE/LC_MESSAGES/dino.mo +share/locale/oc/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/pl/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/pl/LC_MESSAGES/dino-openpgp.mo share/locale/pl/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/pt_BR/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/pt_BR/LC_MESSAGES/dino-openpgp.mo share/locale/pt_BR/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/ro/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/ro/LC_MESSAGES/dino-openpgp.mo @@ -82,12 +89,15 @@ share/locale/ro/LC_MESSAGES/dino.mo %%OMEMO%%share/locale/ru/LC_MESSAGES/dino-omemo.mo %%GNUPG%%share/locale/ru/LC_MESSAGES/dino-openpgp.mo share/locale/ru/LC_MESSAGES/dino.mo -%%OMEMO%%share/locale/zh_Hans/LC_MESSAGES/dino-omemo.mo -%%GNUPG%%share/locale/zh_Hans/LC_MESSAGES/dino-openpgp.mo -share/locale/zh_Hans/LC_MESSAGES/dino.mo -%%OMEMO%%share/locale/zh_Hant/LC_MESSAGES/dino-omemo.mo -%%GNUPG%%share/locale/zh_Hant/LC_MESSAGES/dino-openpgp.mo -share/locale/zh_Hant/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/sv/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/sv/LC_MESSAGES/dino-openpgp.mo +share/locale/sv/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo +share/locale/zh_CN/LC_MESSAGES/dino.mo +%%OMEMO%%share/locale/zh_TW/LC_MESSAGES/dino-omemo.mo +%%GNUPG%%share/locale/zh_TW/LC_MESSAGES/dino-openpgp.mo +share/locale/zh_TW/LC_MESSAGES/dino.mo share/metainfo/im.dino.Dino.appdata.xml share/vala/vapi/dino.deps share/vala/vapi/dino.vapi -- cgit v1.2.3