mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
Use KDE_INVENT where appropriate
KDE ports that use unreleased versions / versions straight from git. PORTVERSION or DISTVERSION increased: - audio/amarok has a newer tag so the commit hash jumps. - devel/heaptrack has a newer tag so the commit hash jumps. - graphics/kooka advances to a newer commit, nothing spectacular. - graphics/peruse advances a great deal to its current state, which is slightly-before-a-real-release. This one will be dropping KDE_INVENT and going to normally-released soon, says upstream. - net/smb4k has a newer tag so the commit hash jumps. PORTVERSION unchanged, but I didn't bump PORTREVISION either because it's the same software: - editors/kile gets the hash for the tag it was previously using. (because USE_GITLAB does not understand tags and needs a full hash). There is lots of newer commits but nothing that looks like a complete releaseable state. - net-im/ruqola gets the hash for the tag it was previously using. Note that none of the updates that might have been possible were reported by portscout; that's part of the hazard of using a semi- official-at-best mirror. I hope it does catch updates from KDE Invent, although these bits of software have flaky update schedules anyway. Reviewed by: tcberner
This commit is contained in:
parent
31950a30cd
commit
4444bd4182
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=565179
@ -2,9 +2,7 @@
|
||||
|
||||
PORTNAME= amarok
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2.9.70
|
||||
PKGVERSIONSUFFIX= -g${GH_TAGNAME}
|
||||
PORTREVISION= 3
|
||||
DISTVERSION= 2.9.71
|
||||
CATEGORIES= audio kde
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
@ -39,11 +37,9 @@ USE_KDE= archive auth attica bookmarks codecs config configwidgets \
|
||||
USE_XORG= ice sm x11 xext
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFIGURE_ENV= MYSQL_DIR=${LOCALBASE}
|
||||
KDE_INVENT= 3e11ccdd1417e70486eaaa84d8475182eec44c20 multimedia
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= kde
|
||||
GH_TAGNAME= 0aa6ae0c77
|
||||
CONFIGURE_ENV= MYSQL_DIR=${LOCALBASE}
|
||||
|
||||
SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
|
||||
CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLBASE}
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1558016091
|
||||
SHA256 (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 2c236fb6853d697f3cb80bfc8289c2bdfa39098b662938143bc6b287f4c7cb84
|
||||
SIZE (kde-amarok-v2.9.70-0aa6ae0c77_GH0.tar.gz) = 21070462
|
||||
TIMESTAMP = 1613167882
|
||||
SHA256 (multimedia-amarok-3e11ccdd1417e70486eaaa84d8475182eec44c20_GL0.tar.gz) = d019e039d16bd53e67eb8b825367ff33dadb6c024505e8f93544620e92f2e078
|
||||
SIZE (multimedia-amarok-3e11ccdd1417e70486eaaa84d8475182eec44c20_GL0.tar.gz) = 21082084
|
||||
|
@ -2,9 +2,7 @@
|
||||
|
||||
PORTNAME= heaptrack
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.1.0-179
|
||||
DISTVERSIONSUFFIX= -gb0f8f2d
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 1.2.0
|
||||
CATEGORIES= devel kde
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
@ -19,8 +17,6 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
|
||||
|
||||
USES= cmake compiler:c++11-lang desktop-file-utils kde:5 \
|
||||
localbase qt:5 tar:xz
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= KDE
|
||||
USE_KDE= auth auth codecs completion config config \
|
||||
configwidgets coreaddons ecm i18n itemmodels \
|
||||
jobwidgets kio kio service threadweaver \
|
||||
@ -28,4 +24,6 @@ USE_KDE= auth auth codecs completion config config \
|
||||
USE_QT= concurrent core dbus gui network widgets xml \
|
||||
buildtools_build qmake_build
|
||||
|
||||
KDE_INVENT= bc9e3744bcc47de978673d1e382f4125a1ab5fa8 sdk
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1589719835
|
||||
SHA256 (KDE-heaptrack-v1.1.0-179-gb0f8f2d_GH0.tar.gz) = 2f889dd4880f9784015e32195efba84b9e2fae55e5eba0fcfa8547431c8fb6a0
|
||||
SIZE (KDE-heaptrack-v1.1.0-179-gb0f8f2d_GH0.tar.gz) = 1116637
|
||||
TIMESTAMP = 1613167892
|
||||
SHA256 (sdk-heaptrack-bc9e3744bcc47de978673d1e382f4125a1ab5fa8_GL0.tar.gz) = 06cc60dc57104b177b0909eb3c63e6cca1a645da095730a2b80e598fdf0253e8
|
||||
SIZE (sdk-heaptrack-bc9e3744bcc47de978673d1e382f4125a1ab5fa8_GL0.tar.gz) = 1115079
|
||||
|
@ -26,8 +26,7 @@ USE_QT= concurrent core dbus gui network script widgets xml \
|
||||
buildtools_build qmake_build
|
||||
SHEBANG_FILES= *.pl
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= kde
|
||||
KDE_INVENT= 09ee4ef0417165b93da82c1fc057b9e1713a0c05 office
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1571556354
|
||||
SHA256 (kde-kile-v3.0b3_GH0.tar.gz) = ddc277e1589563475376067ad317eef5a8cc9f5cb82f1338619d6b6d52ddf4e1
|
||||
SIZE (kde-kile-v3.0b3_GH0.tar.gz) = 3629504
|
||||
TIMESTAMP = 1613082157
|
||||
SHA256 (office-kile-09ee4ef0417165b93da82c1fc057b9e1713a0c05_GL0.tar.gz) = 67fdfbf30b76e769c1c63408c6ba22f11af5494ca35d9058a4a8c3a0adacfa25
|
||||
SIZE (office-kile-09ee4ef0417165b93da82c1fc057b9e1713a0c05_GL0.tar.gz) = 3627748
|
||||
|
@ -1,9 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= kooka
|
||||
DISTVERSION= 0.61-296
|
||||
PORTREVISION= 1
|
||||
DISTVERSIONSUFFIX= -g22e3bcd
|
||||
DISTVERSION= 0.61-323
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= graphics kde
|
||||
|
||||
@ -17,14 +15,14 @@ LIB_DEPENDS= libpaper.so:print/libpaper \
|
||||
libtiff.so:graphics/tiff
|
||||
|
||||
USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= KDE
|
||||
USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \
|
||||
ecm i18n iconthemes itemviews jobwidgets kio service solid sonnet \
|
||||
textwidgets widgetsaddons xmlgui
|
||||
USE_QT= concurrent core dbus gui network printsupport widgets xml \
|
||||
buildtools_build qmake_build
|
||||
|
||||
KDE_INVENT= 3ed25fb9a1a62b88240a4f0f403b1ad49cf0adeb
|
||||
|
||||
PORTSCOUT= limit:^0\.
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1558807097
|
||||
SHA256 (KDE-kooka-0.61-296-g22e3bcd_GH0.tar.gz) = a4e4d303526a91e4b7f136df709e5aa3142b6dbef6e44023701fc3802a0ba0fb
|
||||
SIZE (KDE-kooka-0.61-296-g22e3bcd_GH0.tar.gz) = 505094
|
||||
TIMESTAMP = 1613081964
|
||||
SHA256 (graphics-kooka-3ed25fb9a1a62b88240a4f0f403b1ad49cf0adeb_GL0.tar.gz) = bf71100b8b187790f40185569d901a23926e0e4a95f0aca666dc1c36b20cb182
|
||||
SIZE (graphics-kooka-3ed25fb9a1a62b88240a4f0f403b1ad49cf0adeb_GL0.tar.gz) = 505548
|
||||
|
@ -1,9 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= peruse
|
||||
DISTVERSION= 1.2-186
|
||||
PORTREVISION= 1
|
||||
DISTVERSIONSUFFIX= -g4982089
|
||||
DISTVERSION= 1.2-502
|
||||
CATEGORIES= graphics kde
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
@ -12,12 +10,12 @@ COMMENT= Comic book viewer
|
||||
LICENSE= LGPL21
|
||||
|
||||
USES= cmake compiler:c++11-lang pkgconfig kde:5 qt:5 tar:xz
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= KDE
|
||||
USE_KDE= archive baloo completion config coreaddons ecm filemetadata i18n \
|
||||
iconthemes jobwidgets kdeclarative kio package service \
|
||||
widgetsaddons
|
||||
USE_QT= concurrent core dbus declarative gui network opengl sql widgets \
|
||||
USE_KDE= archive attica baloo completion config coreaddons crash ecm filemetadata guiaddons i18n \
|
||||
iconthemes jobwidgets kdeclarative kio newstuff package service \
|
||||
widgetsaddons windowsystem
|
||||
USE_QT= concurrent core dbus declarative gui network opengl sql widgets xml \
|
||||
buildtools_build qmake_build
|
||||
|
||||
KDE_INVENT= 8d1de5f4a7c4a6ca7444b0c55cb9aaa44a982a78
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1558813347
|
||||
SHA256 (KDE-peruse-1.2-186-g4982089_GH0.tar.gz) = bf035ffd3afec1d659f74bdb009b7b5a98831a258a7804c2f2ef5db02ed4b31c
|
||||
SIZE (KDE-peruse-1.2-186-g4982089_GH0.tar.gz) = 281755
|
||||
TIMESTAMP = 1613080030
|
||||
SHA256 (graphics-peruse-8d1de5f4a7c4a6ca7444b0c55cb9aaa44a982a78_GL0.tar.gz) = 0a3c5237c9d2f5e0f3b4fc6172e3597592a1f5c5dbbd880ce74c5cb738d8d9a5
|
||||
SIZE (graphics-peruse-8d1de5f4a7c4a6ca7444b0c55cb9aaa44a982a78_GL0.tar.gz) = 344683
|
||||
|
@ -1,57 +0,0 @@
|
||||
commit bea1c027ed5c863ae21df895d62d7a519bc24eaf
|
||||
Author: Adriaan de Groot <groot@kde.org>
|
||||
Date: Sat Aug 10 21:54:33 2019 +0200
|
||||
|
||||
Fix build with CMake 3.15
|
||||
|
||||
Summary:
|
||||
- The build flags for the C part of the library overwrite the
|
||||
compile flags for C++, in particular, they add -std=c99
|
||||
to the C++ compilation.
|
||||
- The C parts get auto-mocced (!) which generates a C++
|
||||
file (although it's empty), which then gets compiled with
|
||||
the C flags (and weird -std= setting).
|
||||
- For clang, that leads to a build failure.
|
||||
|
||||
So switch out some things:
|
||||
|
||||
- Build the C parts as an OBJECT library,
|
||||
- Don't apply the C flags to anything but that OBJECT library,
|
||||
- and don't automoc C code.
|
||||
|
||||
Test Plan: It now builds when CMake 3.15.2 is used.
|
||||
|
||||
Reviewers: leinir
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D23076
|
||||
diff --git src/qtquick/karchive-rar/CMakeLists.txt src/qtquick/karchive-rar/CMakeLists.txt
|
||||
index 3928dfd..022ecd1 100644
|
||||
--- src/qtquick/karchive-rar/CMakeLists.txt
|
||||
+++ src/qtquick/karchive-rar/CMakeLists.txt
|
||||
@@ -2,10 +2,6 @@ project(karchive-rar)
|
||||
|
||||
find_package(ZLIB)
|
||||
|
||||
-if (UNIX OR MINGW)
|
||||
- add_compile_options(-std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
|
||||
-endif (UNIX OR MINGW)
|
||||
-
|
||||
set(unarr_SRCS
|
||||
unarr/rar/uncompress-rar.c
|
||||
unarr/rar/huffman-rar.c
|
||||
@@ -31,7 +27,14 @@ set(karchive_rar_SRCS
|
||||
KRarFileEntry.cpp
|
||||
)
|
||||
|
||||
-add_library(karchive-rar STATIC ${karchive_rar_SRCS} ${unarr_SRCS})
|
||||
+add_library(karchive-c-unarr OBJECT ${unarr_SRCS})
|
||||
+if (UNIX OR MINGW)
|
||||
+ target_compile_options(karchive-c-unarr PRIVATE -std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
|
||||
+ set_property(TARGET karchive-c-unarr PROPERTY AUTOMOC OFF)
|
||||
+endif (UNIX OR MINGW)
|
||||
+
|
||||
+
|
||||
+add_library(karchive-rar STATIC ${karchive_rar_SRCS} $<TARGET_OBJECTS:karchive-c-unarr>)
|
||||
target_link_libraries(karchive-rar
|
||||
PUBLIC KF5::Archive
|
||||
)
|
@ -1,6 +1,5 @@
|
||||
bin/peruse
|
||||
bin/perusecreator
|
||||
etc/xdg/peruse.knsrc
|
||||
lib/libacbf.so
|
||||
lib/libacbf.so.0.1
|
||||
%%QT_QMLDIR%%/org/kde/contentlist/libcontentlistqmlplugin.so
|
||||
@ -16,39 +15,4 @@ share/icons/hicolor/scalable/apps/peruse-creator.svg
|
||||
share/icons/hicolor/scalable/apps/peruse.svg
|
||||
share/metainfo/org.kde.peruse.appdata.xml
|
||||
share/metainfo/org.kde.perusecreator.appdata.xml
|
||||
%%DATADIR%%/qml/Book.qml
|
||||
%%DATADIR%%/qml/BookDetails.qml
|
||||
%%DATADIR%%/qml/Bookshelf.qml
|
||||
%%DATADIR%%/qml/FileFinder.qml
|
||||
%%DATADIR%%/qml/Main.qml
|
||||
%%DATADIR%%/qml/MobileMain.qml
|
||||
%%DATADIR%%/qml/NewStuffStuff.qml
|
||||
%%DATADIR%%/qml/PeruseContextDrawer.qml
|
||||
%%DATADIR%%/qml/PeruseMain.qml
|
||||
%%DATADIR%%/qml/SearchBox.qml
|
||||
%%DATADIR%%/qml/Settings.qml
|
||||
%%DATADIR%%/qml/Store.qml
|
||||
%%DATADIR%%/qml/WelcomePage.qml
|
||||
%%DATADIR%%/qml/listcomponents/BookTile.qml
|
||||
%%DATADIR%%/qml/listcomponents/BookTileTall.qml
|
||||
%%DATADIR%%/qml/listcomponents/CategoryTile.qml
|
||||
%%DATADIR%%/qml/listcomponents/CategoryTileTall.qml
|
||||
%%DATADIR%%/qml/listcomponents/ListPageHeader.qml
|
||||
%%DATADIR%%/qml/listcomponents/Section.qml
|
||||
%%DATADIR%%/qml/viewers/ImageBrowser.qml
|
||||
%%DATADIR%%/qml/viewers/ViewerBase.qml
|
||||
%%DATADIR%%/qml/viewers/cbr.qml
|
||||
%%DATADIR%%/qml/viewers/folderofimages.qml
|
||||
%%DATADIR%%/qml/viewers/okular.qml
|
||||
%%DATADIR%%creator/qml/AddPageArea.qml
|
||||
%%DATADIR%%creator/qml/AddPageSheet.qml
|
||||
%%DATADIR%%creator/qml/Book.qml
|
||||
%%DATADIR%%creator/qml/BookMetainfoPage.qml
|
||||
%%DATADIR%%creator/qml/BookPage.qml
|
||||
%%DATADIR%%creator/qml/CreateNewBook.qml
|
||||
%%DATADIR%%creator/qml/Main.qml
|
||||
%%DATADIR%%creator/qml/PageMetaInfo.qml
|
||||
%%DATADIR%%creator/qml/Settings.qml
|
||||
%%DATADIR%%creator/qml/WelcomePage.qml
|
||||
%%DATADIR%%creator/qml/metainfoeditors/AuthorEntryEditor.qml
|
||||
%%DATADIR%%creator/qml/metainfoeditors/LanguageTextEntryEditor.qml
|
||||
share/knsrcfiles/peruse.knsrc
|
||||
|
@ -23,8 +23,8 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
|
||||
USE_QT= concurrent core dbus declarative declarative gui multimedia \
|
||||
network networkauth speech xml websockets widgets \
|
||||
buildtools_build qmake_build
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= KDE
|
||||
|
||||
KDE_INVENT= 9a770478085e737b291db2b50fe76a9b7704cd7d network
|
||||
|
||||
PLIST_SUB= SO_VER=${DISTVERSION}
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1612351587
|
||||
SHA256 (KDE-ruqola-v1.3.0_GH0.tar.gz) = 1fd50e4e12c3d5468c247289927528a93ae8d78e2c6e0143a94ebe96091c71bb
|
||||
SIZE (KDE-ruqola-v1.3.0_GH0.tar.gz) = 747043
|
||||
TIMESTAMP = 1613123601
|
||||
SHA256 (network-ruqola-9a770478085e737b291db2b50fe76a9b7704cd7d_GL0.tar.gz) = 32b011c4b1b08f68f8d39505e18c3579160acfe45e9fa8521ebf8a681861c796
|
||||
SIZE (network-ruqola-9a770478085e737b291db2b50fe76a9b7704cd7d_GL0.tar.gz) = 742436
|
||||
|
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= smb4k
|
||||
DISTVERSION= 3.0.4
|
||||
DISTVERSION= 3.0.7
|
||||
CATEGORIES= net kde
|
||||
|
||||
MAINTAINER= kde@FreeBSD.org
|
||||
@ -13,9 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
RUN_DEPENDS= rsync:net/rsync
|
||||
|
||||
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 samba tar:bzip2
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= KDE
|
||||
|
||||
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
|
||||
dbusaddons ecm i18n iconthemes jobwidgets kio notifications \
|
||||
plasma-framework service solid wallet widgetsaddons \
|
||||
@ -24,4 +21,6 @@ USE_QT= concurrent core dbus declarative gui network printsupport \
|
||||
testlib widgets xml \
|
||||
buildtools_build qmake_build
|
||||
|
||||
KDE_INVENT= 1a7856954c88bc49e5f1b8b071c209ac6c3d6b45 network
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1587751150
|
||||
SHA256 (KDE-smb4k-3.0.4_GH0.tar.gz) = dbbdb051cd767d3794574be31adbf732681a337bd56a6911c9f6baacc7b7ba6e
|
||||
SIZE (KDE-smb4k-3.0.4_GH0.tar.gz) = 3498448
|
||||
TIMESTAMP = 1613167901
|
||||
SHA256 (network-smb4k-1a7856954c88bc49e5f1b8b071c209ac6c3d6b45_GL0.tar.gz) = 9ff6a72cf885c22b0154aaede0fea8c363ab614841bf38635a6cfbf8a78bca95
|
||||
SIZE (network-smb4k-1a7856954c88bc49e5f1b8b071c209ac6c3d6b45_GL0.tar.gz) = 3505741
|
||||
|
Loading…
Reference in New Issue
Block a user