Index: branches/2017Q3/security/keepassxc/Makefile =================================================================== --- branches/2017Q3/security/keepassxc/Makefile (revision 445741) +++ branches/2017Q3/security/keepassxc/Makefile (revision 445742) @@ -1,50 +1,61 @@ # $FreeBSD$ PORTNAME= keepassxc -PORTVERSION= 2.1.4 +PORTVERSION= 2.2.0 CATEGORIES= security MAINTAINER= melanhit@gmail.com COMMENT= KeePass Cross-platform Community Edition LICENSE= BOOST-1.0 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 NOKIA-LGPL-EXCEPTION LICENSE_COMB= multi LICENSE_NAME_BOOST-1.0= Boost Software License version 1.0 LICENSE_NAME_NOKIA-LGPL-EXCEPTION= Nokia Qt LGPL Exception version 1.1 LICENSE_FILE_BOOST-1.0= ${WRKSRC}/LICENSE.BOOST-1.0 LICENSE_FILE_NOKIA-LGPL-EXCEPTION= ${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION LICENSE_PERMS_BOOST-1.0= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_NOKIA-LGPL-EXCEPTION= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error CONFLICTS_INSTALL= keepassx-0.* keepassx2-* keepassx-* USES= cmake:outsource compiler:c++11-lib desktop-file-utils shared-mime-info USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_QT5= buildtools_build concurrent core dbus gui linguisttools network \ qmake_build testlib widgets USE_XORG= ice inputproto sm x11 xcursor xext xfixes xrandr xrender xt USE_GITHUB= yes GH_ACCOUNT= keepassxreboot CMAKE_ARGS+= -DZLIB_SUPPORTS_GZIP:BOOL=ON -OPTIONS_DEFINE= AUTOTYPE HTTP TEST +OPTIONS_DEFINE= AUTOTYPE HTTP YUBIKEY TEST OPTIONS_DEFAULT= AUTOTYPE HTTP OPTIONS_SUB= yes AUTOTYPE_CMAKE_BOOL= WITH_XC_AUTOTYPE AUTOTYPE_DESC= Auto-type passwords in input fields AUTOTYPE_USE= QT5=x11extras XORG=xi,xtst HTTP_CMAKE_BOOL= WITH_XC_HTTP HTTP_DESC= KeePassHTTP support for ChromeIPass and PassIFox +YUBIKEY_CMAKE_BOOL= WITH_XC_YUBIKEY +YUBIKEY_DESC= Include YubiKey support +YUBIKEY_LIB_DEPENDS= libyubikey.so:security/libyubikey \ + libykpers-1.so:security/ykpers + TEST_CMAKE_BOOL= WITH_TESTS WITH_GUI_TESTS TEST_TEST_TARGET= test + +post-patch: + @${REINPLACE_CMD} -e 's|Q_OS_LINUX|Q_OS_UNIX|g' \ + ${WRKSRC}/src/core/ScreenLockListenerPrivate.cpp \ + ${WRKSRC}/src/gui/MainWindow.cpp \ + ${WRKSRC}/src/main.cpp .include Index: branches/2017Q3/security/keepassxc/distinfo =================================================================== --- branches/2017Q3/security/keepassxc/distinfo (revision 445741) +++ branches/2017Q3/security/keepassxc/distinfo (revision 445742) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491852798 -SHA256 (keepassxreboot-keepassxc-2.1.4_GH0.tar.gz) = 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 -SIZE (keepassxreboot-keepassxc-2.1.4_GH0.tar.gz) = 3345520 +TIMESTAMP = 1499196985 +SHA256 (keepassxreboot-keepassxc-2.2.0_GH0.tar.gz) = 9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8 +SIZE (keepassxreboot-keepassxc-2.2.0_GH0.tar.gz) = 3814252 Index: branches/2017Q3/security/keepassxc/files/patch-CMakeLists.txt =================================================================== --- branches/2017Q3/security/keepassxc/files/patch-CMakeLists.txt (nonexistent) +++ branches/2017Q3/security/keepassxc/files/patch-CMakeLists.txt (revision 445742) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2017-06-25 21:52:43 UTC ++++ CMakeLists.txt +@@ -89,7 +89,7 @@ add_gcc_compiler_flags("-Wformat=2 -Wmis + add_gcc_compiler_flags("-fvisibility=hidden") + add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden") + +-if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX) ++if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR (CMAKE_COMPILER_IS_CLANGXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.8)) + add_gcc_compiler_flags("-fstack-protector-strong") + else() + add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4") Property changes on: branches/2017Q3/security/keepassxc/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/security/keepassxc/files/patch-src_CMakeLists.txt =================================================================== --- branches/2017Q3/security/keepassxc/files/patch-src_CMakeLists.txt (nonexistent) +++ branches/2017Q3/security/keepassxc/files/patch-src_CMakeLists.txt (revision 445742) @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2017-07-12 02:16:55 UTC ++++ src/CMakeLists.txt +@@ -149,7 +149,7 @@ if(APPLE) + core/ScreenLockListenerMac.cpp + ) + endif() +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + set(keepassx_SOURCES ${keepassx_SOURCES} + core/ScreenLockListenerDBus.h + core/ScreenLockListenerDBus.cpp Property changes on: branches/2017Q3/security/keepassxc/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/security/keepassxc/pkg-descr =================================================================== --- branches/2017Q3/security/keepassxc/pkg-descr (revision 445741) +++ branches/2017Q3/security/keepassxc/pkg-descr (revision 445742) @@ -1,16 +1,21 @@ KeePassXC is a community fork of KeePassX with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Additional features compared to KeePassX: * Auto-Type on all three major platforms (Linux, Windows, OS X) * Stand-alone password generator * Password strength meter + * A generator for time-based one-time passwords * Using website favicons as entry icons * Merging of databases * Automatic reload when the database changed on disk * KeePassHTTP support for use with PassIFox in Mozilla Firefox and chromeIPass in Google Chrome or Chromium. + * YubiKey challenge-response support for strengthening + your database encryption key + * Support for Twofish encryption + * Command line interface * Many bug fixes -WWW: https://keepassxc.org/ +WWW: https://keepassxc.org Index: branches/2017Q3/security/keepassxc/pkg-plist =================================================================== --- branches/2017Q3/security/keepassxc/pkg-plist (revision 445741) +++ branches/2017Q3/security/keepassxc/pkg-plist (revision 445742) @@ -1,250 +1,287 @@ bin/keepassxc +bin/keepassxc-cli %%AUTOTYPE%%lib/keepassxc/libkeepassx-autotype-xcb.so share/applications/keepassxc.desktop share/icons/hicolor/128x128/apps/keepassxc-dark.png share/icons/hicolor/128x128/apps/keepassxc-locked.png +share/icons/hicolor/128x128/apps/keepassxc-unlocked.png share/icons/hicolor/128x128/apps/keepassxc.png share/icons/hicolor/128x128/mimetypes/application-x-keepassxc.png share/icons/hicolor/16x16/apps/keepassxc-dark.png share/icons/hicolor/16x16/apps/keepassxc-locked.png +share/icons/hicolor/16x16/apps/keepassxc-unlocked.png share/icons/hicolor/16x16/apps/keepassxc.png share/icons/hicolor/16x16/mimetypes/application-x-keepassxc.png share/icons/hicolor/22x22/mimetypes/application-x-keepassxc.png share/icons/hicolor/24x24/apps/keepassxc-dark.png share/icons/hicolor/24x24/apps/keepassxc-locked.png +share/icons/hicolor/24x24/apps/keepassxc-unlocked.png share/icons/hicolor/24x24/apps/keepassxc.png share/icons/hicolor/256x256/apps/keepassxc-dark.png share/icons/hicolor/256x256/apps/keepassxc-locked.png +share/icons/hicolor/256x256/apps/keepassxc-unlocked.png share/icons/hicolor/256x256/apps/keepassxc.png share/icons/hicolor/32x32/apps/keepassxc-dark.png share/icons/hicolor/32x32/apps/keepassxc-locked.png +share/icons/hicolor/32x32/apps/keepassxc-unlocked.png share/icons/hicolor/32x32/apps/keepassxc.png share/icons/hicolor/32x32/mimetypes/application-x-keepassxc.png share/icons/hicolor/48x48/apps/keepassxc-dark.png share/icons/hicolor/48x48/apps/keepassxc-locked.png +share/icons/hicolor/48x48/apps/keepassxc-unlocked.png share/icons/hicolor/48x48/apps/keepassxc.png share/icons/hicolor/64x64/apps/keepassxc-dark.png share/icons/hicolor/64x64/apps/keepassxc-locked.png +share/icons/hicolor/64x64/apps/keepassxc-unlocked.png share/icons/hicolor/64x64/apps/keepassxc.png share/icons/hicolor/64x64/mimetypes/application-x-keepassxc.png share/icons/hicolor/scalable/apps/keepassxc-dark.svgz share/icons/hicolor/scalable/apps/keepassxc-locked.svgz +share/icons/hicolor/scalable/apps/keepassxc-unlocked.svgz share/icons/hicolor/scalable/apps/keepassxc.svgz share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svgz %%DATADIR%%/icons/application/128x128/apps/keepassxc-dark.png %%DATADIR%%/icons/application/128x128/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/128x128/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/128x128/apps/keepassxc.png %%DATADIR%%/icons/application/128x128/mimetypes/application-x-keepassxc.png %%DATADIR%%/icons/application/16x16/actions/application-exit.png %%DATADIR%%/icons/application/16x16/actions/auto-type.png %%DATADIR%%/icons/application/16x16/actions/configure.png %%DATADIR%%/icons/application/16x16/actions/database-change-key.png %%DATADIR%%/icons/application/16x16/actions/document-close.png %%DATADIR%%/icons/application/16x16/actions/document-edit.png %%DATADIR%%/icons/application/16x16/actions/document-encrypt.png %%DATADIR%%/icons/application/16x16/actions/document-new.png %%DATADIR%%/icons/application/16x16/actions/document-open.png %%DATADIR%%/icons/application/16x16/actions/document-save-as.png %%DATADIR%%/icons/application/16x16/actions/document-save.png %%DATADIR%%/icons/application/16x16/actions/edit-clear-locationbar-ltr.png %%DATADIR%%/icons/application/16x16/actions/edit-clear-locationbar-rtl.png %%DATADIR%%/icons/application/16x16/actions/entry-clone.png %%DATADIR%%/icons/application/16x16/actions/entry-delete.png %%DATADIR%%/icons/application/16x16/actions/entry-edit.png %%DATADIR%%/icons/application/16x16/actions/entry-new.png %%DATADIR%%/icons/application/16x16/actions/group-delete.png %%DATADIR%%/icons/application/16x16/actions/group-edit.png +%%DATADIR%%/icons/application/16x16/actions/group-empty-trash.png %%DATADIR%%/icons/application/16x16/actions/group-new.png %%DATADIR%%/icons/application/16x16/actions/help-about.png +%%DATADIR%%/icons/application/16x16/actions/message-close.png %%DATADIR%%/icons/application/16x16/actions/password-copy.png %%DATADIR%%/icons/application/16x16/actions/password-generate.png %%DATADIR%%/icons/application/16x16/actions/password-generator.png %%DATADIR%%/icons/application/16x16/actions/password-show-off.png %%DATADIR%%/icons/application/16x16/actions/password-show-on.png %%DATADIR%%/icons/application/16x16/actions/system-search.png %%DATADIR%%/icons/application/16x16/actions/username-copy.png %%DATADIR%%/icons/application/16x16/apps/keepassxc-dark.png %%DATADIR%%/icons/application/16x16/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/16x16/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/16x16/apps/keepassxc.png %%DATADIR%%/icons/application/16x16/mimetypes/application-x-keepassxc.png %%DATADIR%%/icons/application/22x22/actions/dialog-close.png %%DATADIR%%/icons/application/22x22/actions/dialog-ok.png %%DATADIR%%/icons/application/22x22/actions/document-encrypt.png +%%DATADIR%%/icons/application/22x22/actions/document-new.png %%DATADIR%%/icons/application/22x22/actions/document-open.png %%DATADIR%%/icons/application/22x22/actions/document-save.png %%DATADIR%%/icons/application/22x22/actions/entry-delete.png %%DATADIR%%/icons/application/22x22/actions/entry-edit.png %%DATADIR%%/icons/application/22x22/actions/entry-new.png +%%DATADIR%%/icons/application/22x22/actions/message-close.png %%DATADIR%%/icons/application/22x22/actions/password-copy.png %%DATADIR%%/icons/application/22x22/actions/password-generator.png %%DATADIR%%/icons/application/22x22/actions/system-search.png %%DATADIR%%/icons/application/22x22/actions/username-copy.png %%DATADIR%%/icons/application/22x22/mimetypes/application-x-keepassxc.png %%DATADIR%%/icons/application/22x22/status/dialog-error.png %%DATADIR%%/icons/application/22x22/status/dialog-information.png %%DATADIR%%/icons/application/22x22/status/dialog-warning.png %%DATADIR%%/icons/application/24x24/apps/keepassxc-dark.png %%DATADIR%%/icons/application/24x24/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/24x24/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/24x24/apps/keepassxc.png %%DATADIR%%/icons/application/256x256/apps/keepassxc-dark.png %%DATADIR%%/icons/application/256x256/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/256x256/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/256x256/apps/keepassxc.png +%%DATADIR%%/icons/application/32x32/actions/document-edit.png +%%DATADIR%%/icons/application/32x32/actions/document-properties.png +%%DATADIR%%/icons/application/32x32/actions/key-enter.png +%%DATADIR%%/icons/application/32x32/actions/view-history.png +%%DATADIR%%/icons/application/32x32/apps/internet-web-browser.png %%DATADIR%%/icons/application/32x32/apps/keepassxc-dark.png %%DATADIR%%/icons/application/32x32/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/32x32/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/32x32/apps/keepassxc.png +%%DATADIR%%/icons/application/32x32/apps/preferences-desktop-icons.png +%%DATADIR%%/icons/application/32x32/categories/preferences-other.png %%DATADIR%%/icons/application/32x32/mimetypes/application-x-keepassxc.png +%%DATADIR%%/icons/application/32x32/status/security-high.png %%DATADIR%%/icons/application/48x48/apps/keepassxc-dark.png %%DATADIR%%/icons/application/48x48/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/48x48/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/48x48/apps/keepassxc.png %%DATADIR%%/icons/application/64x64/apps/keepassxc-dark.png %%DATADIR%%/icons/application/64x64/apps/keepassxc-locked.png +%%DATADIR%%/icons/application/64x64/apps/keepassxc-unlocked.png %%DATADIR%%/icons/application/64x64/apps/keepassxc.png %%DATADIR%%/icons/application/64x64/mimetypes/application-x-keepassxc.png %%DATADIR%%/icons/application/scalable/apps/keepassxc-dark.svgz %%DATADIR%%/icons/application/scalable/apps/keepassxc-locked.svgz +%%DATADIR%%/icons/application/scalable/apps/keepassxc-unlocked.svgz %%DATADIR%%/icons/application/scalable/apps/keepassxc.svgz %%DATADIR%%/icons/application/scalable/mimetypes/application-x-keepassxc.svgz %%DATADIR%%/icons/database/C00_Password.png %%DATADIR%%/icons/database/C01_Package_Network.png %%DATADIR%%/icons/database/C02_MessageBox_Warning.png %%DATADIR%%/icons/database/C03_Server.png %%DATADIR%%/icons/database/C04_Klipper.png %%DATADIR%%/icons/database/C05_Edu_Languages.png %%DATADIR%%/icons/database/C06_KCMDF.png %%DATADIR%%/icons/database/C07_Kate.png %%DATADIR%%/icons/database/C08_Socket.png %%DATADIR%%/icons/database/C09_Identity.png %%DATADIR%%/icons/database/C10_Kontact.png %%DATADIR%%/icons/database/C11_Camera.png %%DATADIR%%/icons/database/C12_IRKickFlash.png %%DATADIR%%/icons/database/C13_KGPG_Key3.png %%DATADIR%%/icons/database/C14_Laptop_Power.png %%DATADIR%%/icons/database/C15_Scanner.png %%DATADIR%%/icons/database/C16_Mozilla_Firebird.png %%DATADIR%%/icons/database/C17_CDROM_Unmount.png %%DATADIR%%/icons/database/C18_Display.png %%DATADIR%%/icons/database/C19_Mail_Generic.png %%DATADIR%%/icons/database/C20_Misc.png %%DATADIR%%/icons/database/C21_KOrganizer.png %%DATADIR%%/icons/database/C22_ASCII.png %%DATADIR%%/icons/database/C23_Icons.png %%DATADIR%%/icons/database/C24_Connect_Established.png %%DATADIR%%/icons/database/C25_Folder_Mail.png %%DATADIR%%/icons/database/C26_FileSave.png %%DATADIR%%/icons/database/C27_NFS_Unmount.png %%DATADIR%%/icons/database/C28_QuickTime.png %%DATADIR%%/icons/database/C29_KGPG_Term.png %%DATADIR%%/icons/database/C30_Konsole.png %%DATADIR%%/icons/database/C31_FilePrint.png %%DATADIR%%/icons/database/C32_FSView.png %%DATADIR%%/icons/database/C33_Run.png %%DATADIR%%/icons/database/C34_Configure.png %%DATADIR%%/icons/database/C35_KRFB.png %%DATADIR%%/icons/database/C36_Ark.png %%DATADIR%%/icons/database/C37_KPercentage.png %%DATADIR%%/icons/database/C38_Samba_Unmount.png %%DATADIR%%/icons/database/C39_History.png %%DATADIR%%/icons/database/C40_Mail_Find.png %%DATADIR%%/icons/database/C41_VectorGfx.png %%DATADIR%%/icons/database/C42_KCMMemory.png %%DATADIR%%/icons/database/C43_EditTrash.png %%DATADIR%%/icons/database/C44_KNotes.png %%DATADIR%%/icons/database/C45_Cancel.png %%DATADIR%%/icons/database/C46_Help.png %%DATADIR%%/icons/database/C47_KPackage.png %%DATADIR%%/icons/database/C48_Folder.png %%DATADIR%%/icons/database/C49_Folder_Blue_Open.png %%DATADIR%%/icons/database/C50_Folder_Tar.png %%DATADIR%%/icons/database/C51_Decrypted.png %%DATADIR%%/icons/database/C52_Encrypted.png %%DATADIR%%/icons/database/C53_Apply.png %%DATADIR%%/icons/database/C54_Signature.png %%DATADIR%%/icons/database/C55_Thumbnail.png %%DATADIR%%/icons/database/C56_KAddressBook.png %%DATADIR%%/icons/database/C57_View_Text.png %%DATADIR%%/icons/database/C58_KGPG.png %%DATADIR%%/icons/database/C59_Package_Development.png %%DATADIR%%/icons/database/C60_KFM_Home.png %%DATADIR%%/icons/database/C61_Services.png %%DATADIR%%/icons/database/C62_Tux.png %%DATADIR%%/icons/database/C63_Feather.png %%DATADIR%%/icons/database/C64_Apple.png %%DATADIR%%/icons/database/C65_W.png %%DATADIR%%/icons/database/C66_Money.png %%DATADIR%%/icons/database/C67_Certificate.png %%DATADIR%%/icons/database/C68_BlackBerry.png %%DATADIR%%/translations/keepassx_cs.qm %%DATADIR%%/translations/keepassx_da.qm %%DATADIR%%/translations/keepassx_de.qm %%DATADIR%%/translations/keepassx_el.qm %%DATADIR%%/translations/keepassx_en_plurals.qm %%DATADIR%%/translations/keepassx_es.qm +%%DATADIR%%/translations/keepassx_fi.qm %%DATADIR%%/translations/keepassx_fr.qm %%DATADIR%%/translations/keepassx_id.qm %%DATADIR%%/translations/keepassx_it.qm %%DATADIR%%/translations/keepassx_ja.qm +%%DATADIR%%/translations/keepassx_kk.qm %%DATADIR%%/translations/keepassx_ko.qm %%DATADIR%%/translations/keepassx_lt.qm %%DATADIR%%/translations/keepassx_nl_NL.qm %%DATADIR%%/translations/keepassx_pl.qm %%DATADIR%%/translations/keepassx_pt_BR.qm %%DATADIR%%/translations/keepassx_pt_PT.qm %%DATADIR%%/translations/keepassx_ru.qm %%DATADIR%%/translations/keepassx_sl_SI.qm %%DATADIR%%/translations/keepassx_sv.qm %%DATADIR%%/translations/keepassx_uk.qm %%DATADIR%%/translations/keepassx_zh_CN.qm %%DATADIR%%/translations/keepassx_zh_TW.qm +%%DATADIR%%/wordlists/eff_large.wordlist share/mime/packages/keepassxc.xml @dir share/icons/hicolor/scalable/apps @dir share/icons/hicolor/scalable @dir share/icons/hicolor/64x64/mimetypes @dir share/icons/hicolor/64x64/apps @dir share/icons/hicolor/64x64 @dir share/icons/hicolor/48x48/apps @dir share/icons/hicolor/48x48 @dir share/icons/hicolor/32x32/mimetypes @dir share/icons/hicolor/32x32/apps @dir share/icons/hicolor/32x32 @dir share/icons/hicolor/256x256/apps @dir share/icons/hicolor/256x256 @dir share/icons/hicolor/24x24/apps @dir share/icons/hicolor/24x24 @dir share/icons/hicolor/22x22/mimetypes @dir share/icons/hicolor/22x22 @dir share/icons/hicolor/16x16/mimetypes @dir share/icons/hicolor/16x16/apps @dir share/icons/hicolor/16x16 @dir share/icons/hicolor/128x128/mimetypes @dir share/icons/hicolor/128x128/apps @dir share/icons/hicolor/128x128 +@dir %%DATADIR%%/wordlists @dir %%DATADIR%%/translations @dir %%DATADIR%%/icons/database +@dir %%DATADIR%%/icons/application/scalable/mimetypes @dir %%DATADIR%%/icons/application/scalable/apps @dir %%DATADIR%%/icons/application/scalable @dir %%DATADIR%%/icons/application/64x64/mimetypes @dir %%DATADIR%%/icons/application/64x64/apps @dir %%DATADIR%%/icons/application/64x64 @dir %%DATADIR%%/icons/application/48x48/apps @dir %%DATADIR%%/icons/application/48x48 +@dir %%DATADIR%%/icons/application/32x32/status @dir %%DATADIR%%/icons/application/32x32/mimetypes +@dir %%DATADIR%%/icons/application/32x32/categories @dir %%DATADIR%%/icons/application/32x32/apps +@dir %%DATADIR%%/icons/application/32x32/actions @dir %%DATADIR%%/icons/application/32x32 @dir %%DATADIR%%/icons/application/256x256/apps @dir %%DATADIR%%/icons/application/256x256 @dir %%DATADIR%%/icons/application/24x24/apps @dir %%DATADIR%%/icons/application/24x24 @dir %%DATADIR%%/icons/application/22x22/status @dir %%DATADIR%%/icons/application/22x22/mimetypes @dir %%DATADIR%%/icons/application/22x22/actions @dir %%DATADIR%%/icons/application/22x22 @dir %%DATADIR%%/icons/application/16x16/mimetypes @dir %%DATADIR%%/icons/application/16x16/apps @dir %%DATADIR%%/icons/application/16x16/actions @dir %%DATADIR%%/icons/application/16x16 @dir %%DATADIR%%/icons/application/128x128/mimetypes @dir %%DATADIR%%/icons/application/128x128/apps @dir %%DATADIR%%/icons/application/128x128 @dir %%DATADIR%%/icons/application @dir %%DATADIR%%/icons @dir %%DATADIR%% Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 445741) +++ branches/2017Q3 (revision 445742) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r445719