CVS commit: pkgsrc/net/owncloudclient

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/owncloudclient
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 8 Mar 2021 13:17:53 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar  8 13:17:53 UTC 2021

Modified Files:
        pkgsrc/net/owncloudclient: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/owncloudclient/patches: patch-CMakeLists.txt

Log Message:
owncloudclient: Update to 2.7.6.3261. Builds again.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/owncloudclient/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/owncloudclient/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/owncloudclient/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/owncloudclient/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/owncloudclient/Makefile
diff -u pkgsrc/net/owncloudclient/Makefile:1.29 pkgsrc/net/owncloudclient/Makefile:1.30
--- pkgsrc/net/owncloudclient/Makefile:1.29     Thu Nov  5 09:08:55 2020
+++ pkgsrc/net/owncloudclient/Makefile  Mon Mar  8 13:17:53 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2020/11/05 09:08:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2021/03/08 13:17:53 nia Exp $
 
-DISTNAME=      owncloudclient-2.2.3
-PKGREVISION=   16
+DISTNAME=      ownCloud-2.7.6.3261
+PKGNAME=       ${DISTNAME:S/ownCloud/owncloudclient/1}
 CATEGORIES=    net
-MASTER_SITES=  https://download.owncloud.com/desktop/stable/
+MASTER_SITES=  https://download.owncloud.com/desktop/ownCloud/stable/${PKGVERSION_NOREV}/source/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
@@ -11,36 +11,26 @@ HOMEPAGE=   https://owncloud.com/
 COMMENT=       Synchronization program for ownCloud
 LICENSE=       gnu-gpl-v2
 
-BROKEN=                "Fails to build with OpenSSL 1.1"
-
-# Do not use libocsync.so from net/ocsync.
-CONFLICTS=     ocsync-[0-9]*
-CONFLICTS=     mirall-[0-9]*
-
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-# I have no idea about CMake...
-LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/owncloud
-
-ETCDIR=                        etc/ownCloud
-MAKE_DIRS+=            ${ETCDIR}
-EGDIR=                 ${PREFIX}/share/examples/owncloud
-INSTALLATION_DIRS=     ${ETCDIR} share/examples/owncloud
-CONF_FILES+=           ${EGDIR}/sync-exclude.lst \
-                       ${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst
-
-post-install:
-       mv ${DESTDIR}${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst \
-               ${DESTDIR}${EGDIR}/sync-exclude.lst
+CMAKE_ARGS+=   -DSYSCONF_INSTALL_DIR=${PKG_SYSCONFDIR}
+CMAKE_ARGS+=   -DBUILD_SHELL_INTEGRATION=OFF
+CMAKE_ARGS+=   -DBUILD_TESTING=OFF
+
+EGDIR=         ${PREFIX}/share/examples/owncloudclient
+CONF_FILES=    ${EGDIR}/sync-exclude.lst \
+               ${PKG_SYSCONFDIR}/ownCloud/sync-exclude.lst
 
-.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+BUILDLINK_API_DEPENDS.sqlite3+=        sqlite3>=3.9.0
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/libinotify/buildlink3.mk"
+.if ${OPSYS} != "Linux"
+.  include "../../devel/libinotify/buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/qt4-qtkeychain/buildlink3.mk"
+.include "../../security/qt5-qtkeychain/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../www/neon/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/owncloudclient/PLIST
diff -u pkgsrc/net/owncloudclient/PLIST:1.5 pkgsrc/net/owncloudclient/PLIST:1.6
--- pkgsrc/net/owncloudclient/PLIST:1.5 Mon Mar 21 11:36:13 2016
+++ pkgsrc/net/owncloudclient/PLIST     Mon Mar  8 13:17:53 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/03/21 11:36:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/03/08 13:17:53 nia Exp $
 bin/owncloud
 bin/owncloudcmd
 include/owncloudsync/creds/abstractcredentials.h
@@ -9,81 +9,25 @@ include/owncloudsync/mirall/networkjobs.
 include/owncloudsync/mirall/progressdispatcher.h
 include/owncloudsync/mirall/syncengine.h
 include/owncloudsync/mirall/syncfileitem.h
-include/owncloudsync/mirall/syncjournaldb.h
 include/owncloudsync/mirall/syncresult.h
+lib/libowncloud_csync.so
+lib/libowncloud_csync.so.0
+lib/libowncloud_csync.so.2.7.6
 lib/libowncloudsync.so
 lib/libowncloudsync.so.0
-lib/libowncloudsync.so.${PKGVERSION}
-lib/owncloud/libocsync.so
-lib/owncloud/libocsync.so.0
-lib/owncloud/libocsync.so.${PKGVERSION}
+lib/libowncloudsync.so.2.7.6
+lib/plugins/owncloudsync_vfs_suffix.so
 share/applications/owncloud.desktop
-share/examples/owncloud/sync-exclude.lst
-share/icons/hicolor/128x128/apps/ownCloud_error.png
-share/icons/hicolor/128x128/apps/ownCloud_error_shared.png
-share/icons/hicolor/128x128/apps/ownCloud_ok.png
-share/icons/hicolor/128x128/apps/ownCloud_ok_shared.png
-share/icons/hicolor/128x128/apps/ownCloud_sync.png
-share/icons/hicolor/128x128/apps/ownCloud_sync_shared.png
-share/icons/hicolor/128x128/apps/ownCloud_warn.png
-share/icons/hicolor/128x128/apps/ownCloud_warn_shared.png
+share/examples/owncloudclient/sync-exclude.lst
+share/icons/hicolor/1024x1024/apps/owncloud.png
 share/icons/hicolor/128x128/apps/owncloud.png
-share/icons/hicolor/16x16/apps/ownCloud_error.png
-share/icons/hicolor/16x16/apps/ownCloud_error_shared.png
-share/icons/hicolor/16x16/apps/ownCloud_ok.png
-share/icons/hicolor/16x16/apps/ownCloud_ok_shared.png
-share/icons/hicolor/16x16/apps/ownCloud_sync.png
-share/icons/hicolor/16x16/apps/ownCloud_sync_shared.png
-share/icons/hicolor/16x16/apps/ownCloud_warn.png
-share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
-share/icons/hicolor/22x22/apps/owncloud.png
-share/icons/hicolor/256x256/apps/ownCloud_error.png
-share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
-share/icons/hicolor/256x256/apps/ownCloud_ok.png
-share/icons/hicolor/256x256/apps/ownCloud_ok_shared.png
-share/icons/hicolor/256x256/apps/ownCloud_sync.png
-share/icons/hicolor/256x256/apps/ownCloud_sync_shared.png
-share/icons/hicolor/256x256/apps/ownCloud_warn.png
-share/icons/hicolor/256x256/apps/ownCloud_warn_shared.png
+share/icons/hicolor/16x16/apps/owncloud.png
+share/icons/hicolor/24x24/apps/owncloud.png
 share/icons/hicolor/256x256/apps/owncloud.png
-share/icons/hicolor/32x32/apps/ownCloud_error.png
-share/icons/hicolor/32x32/apps/ownCloud_error_shared.png
-share/icons/hicolor/32x32/apps/ownCloud_ok.png
-share/icons/hicolor/32x32/apps/ownCloud_ok_shared.png
-share/icons/hicolor/32x32/apps/ownCloud_sync.png
-share/icons/hicolor/32x32/apps/ownCloud_sync_shared.png
-share/icons/hicolor/32x32/apps/ownCloud_warn.png
-share/icons/hicolor/32x32/apps/ownCloud_warn_shared.png
 share/icons/hicolor/32x32/apps/owncloud.png
-share/icons/hicolor/48x48/apps/ownCloud_error.png
-share/icons/hicolor/48x48/apps/ownCloud_error_shared.png
-share/icons/hicolor/48x48/apps/ownCloud_ok.png
-share/icons/hicolor/48x48/apps/ownCloud_ok_shared.png
-share/icons/hicolor/48x48/apps/ownCloud_sync.png
-share/icons/hicolor/48x48/apps/ownCloud_sync_shared.png
-share/icons/hicolor/48x48/apps/ownCloud_warn.png
-share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
 share/icons/hicolor/48x48/apps/owncloud.png
-share/icons/hicolor/512x512/apps/owncloud.png
-share/icons/hicolor/64x64/apps/ownCloud_error.png
-share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
-share/icons/hicolor/64x64/apps/ownCloud_ok.png
-share/icons/hicolor/64x64/apps/ownCloud_ok_shared.png
-share/icons/hicolor/64x64/apps/ownCloud_sync.png
-share/icons/hicolor/64x64/apps/ownCloud_sync_shared.png
-share/icons/hicolor/64x64/apps/ownCloud_warn.png
-share/icons/hicolor/64x64/apps/ownCloud_warn_shared.png
 share/icons/hicolor/64x64/apps/owncloud.png
-share/icons/hicolor/72x72/apps/ownCloud_error.png
-share/icons/hicolor/72x72/apps/ownCloud_error_shared.png
-share/icons/hicolor/72x72/apps/ownCloud_ok.png
-share/icons/hicolor/72x72/apps/ownCloud_ok_shared.png
-share/icons/hicolor/72x72/apps/ownCloud_sync.png
-share/icons/hicolor/72x72/apps/ownCloud_sync_shared.png
-share/icons/hicolor/72x72/apps/ownCloud_warn.png
-share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png
-share/nautilus-python/extensions/syncstate.py
-share/nemo-python/extensions/syncstate.py
+share/mime/packages/owncloud.xml
 share/owncloud/i18n/client_TW.qm
 share/owncloud/i18n/client_ca.qm
 share/owncloud/i18n/client_cs.qm

Index: pkgsrc/net/owncloudclient/distinfo
diff -u pkgsrc/net/owncloudclient/distinfo:1.7 pkgsrc/net/owncloudclient/distinfo:1.8
--- pkgsrc/net/owncloudclient/distinfo:1.7      Sun Sep 25 13:19:46 2016
+++ pkgsrc/net/owncloudclient/distinfo  Mon Mar  8 13:17:53 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/09/25 13:19:46 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2021/03/08 13:17:53 nia Exp $
 
-SHA1 (owncloudclient-2.2.3.tar.xz) = b1434b445dc656ca7b90f6452994efdb59781d01
-RMD160 (owncloudclient-2.2.3.tar.xz) = ac18451135f15e5747f0308c733a07a48f2f6777
-SHA512 (owncloudclient-2.2.3.tar.xz) = 71be325e5d6177a767dc61b043bd6126b5b7a492a2a777c0179c2dbb77bf6104e26fce92734a6d4bfcc7b9c451026e86a2f44d39869e9451f21b0e534c26e189
-Size (owncloudclient-2.2.3.tar.xz) = 12215320 bytes
+SHA1 (ownCloud-2.7.6.3261.tar.xz) = 4fe5ea364f43a09d0b491a3028779cd70813a39d
+RMD160 (ownCloud-2.7.6.3261.tar.xz) = 93db5c13f49f1b53ff198779ab6cf3fb7bc89f22
+SHA512 (ownCloud-2.7.6.3261.tar.xz) = 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
+Size (ownCloud-2.7.6.3261.tar.xz) = 14237692 bytes
+SHA1 (patch-CMakeLists.txt) = 771e7f10d8841a5700ded762ff17cfd75d72120f

Added files:

Index: pkgsrc/net/owncloudclient/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/owncloudclient/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Mar  8 13:17:53 2021
+++ pkgsrc/net/owncloudclient/patches/patch-CMakeLists.txt      Mon Mar  8 13:17:53 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/03/08 13:17:53 nia Exp $
+
+Install config files to example, per pkgsrc norms.
+
+--- CMakeLists.txt.orig        2021-03-08 13:01:22.353460638 +0000
++++ CMakeLists.txt
+@@ -193,7 +193,7 @@ elseif(BUILD_CLIENT)
+     if(WIN32)
+         install(FILES sync-exclude.lst DESTINATION bin)
+     else()
+-        install(FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME})
++        install(FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/owncloudclient)
+     endif()
+ endif()
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index