diff options
author | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
---|---|---|
committer | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
commit | 55d2aaa4eb5201ac97e269fc141e4ee1778379b8 (patch) | |
tree | 810ece5e004aa9e97e26a1ad988ed52552175fb6 /trinity-base/kdenetwork-filesharing | |
parent | 644110a847c5911c2eb04eb53c93031740561efc (diff) | |
download | tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.tar.gz tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.zip |
Clean up and fix TDE Gentoo overlay.
- Remove old v3.5.13 ebuilds and eclasses
- Change repo URL to official TGW
- Remove old HAL and traces (TDEHW is used now)
- Make split between TDE applications and tdebase consistent
- Move TQt into own category (for users filtering dev-qt/ out)
- Change to new TQTDIR var
- Move away from virtual/pam dependency
- Change to use new xorg-proto dependency
- Some cosmetic fixes and removal of unneeded files
- Remove some now obsolete patches
- Change to clean 9999 naming scheme for anything
- Add some potential workaround for newer portage versions
- Add own README
... thanks to Aggi from IRC for some fixes too.
Signed-off-by: Chris <xchrisx@uber.space>
Diffstat (limited to 'trinity-base/kdenetwork-filesharing')
4 files changed, 0 insertions, 91 deletions
diff --git a/trinity-base/kdenetwork-filesharing/Manifest b/trinity-base/kdenetwork-filesharing/Manifest deleted file mode 100644 index 1d49700d..00000000 --- a/trinity-base/kdenetwork-filesharing/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kdenetwork-3.5.13.1.tar.gz 8794225 SHA256 21e69e8cb2550561c26913a5cccdc376115f50cffd43f9a94f7a660a303f46f9 SHA512 b3189a9f5e9cddd130b24a82b95ef90db1ec3c7afa280a46101ba7cbf6f9d92f60a536401f648a96459ba87f70ede5f7ae4affe894515a8e858b40ee79cb1b69 WHIRLPOOL de678ab30e3aa8dc3068c895fd000fdab1bc046e272273bf44196a198210efab82ddde3c5e0ffaa863061e9c56e3a8a68ca2f8f03cd77136755f66688f878c65 diff --git a/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch b/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch deleted file mode 100644 index 956b28f4..00000000 --- a/trinity-base/kdenetwork-filesharing/files/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt -index 41723ee..d466124 100644 ---- a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt -+++ b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt -@@ -37,6 +37,24 @@ tde_add_library( filesharesamba STATIC_PIC AUTOMOC - filemodedlgimpl.cpp smbpasswdfile.cpp passwd.cpp hiddenfileview.cpp - dictmanager.cpp qmultichecklistitem.cpp smbconfconfigwidget.cpp - linuxpermissionchecker.cpp expertuserdlg.ui -+ DEPENDENCIES filesharesamba_generate_headers -+) -+ -+# Those headers are also required by target in another subdirectory. -+# So we have to add such target for our generated header files to avoid -+# race conditions. -+# SEE cmake FAQ: http://www.cmake.org/Wiki/CMake_FAQ -+# -+add_custom_target( filesharesamba_generate_headers -+ DEPENDS -+ ${CMAKE_CURRENT_BINARY_DIR}/share.h -+ ${CMAKE_CURRENT_BINARY_DIR}/share.h -+ ${CMAKE_CURRENT_BINARY_DIR}/socketoptionsdlg.h -+ ${CMAKE_CURRENT_BINARY_DIR}/userselectdlg.h -+ ${CMAKE_CURRENT_BINARY_DIR}/groupselectdlg.h -+ ${CMAKE_CURRENT_BINARY_DIR}/usertab.h -+ ${CMAKE_CURRENT_BINARY_DIR}/filemodedlg.h -+ ${CMAKE_CURRENT_BINARY_DIR}/expertuserdlg.h - ) - - -diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt -index 26d94f5..bd96ae6 100644 ---- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt -+++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt -@@ -11,7 +11,8 @@ - - include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_CURRENT_BINARY_DIR}/../kcm_sambaconf -+ ${CMAKE_BINARY_DIR}/filesharing/advanced/kcm_sambaconf -+ ${CMAKE_SOURCE_DIR}/filesharing/advanced/kcm_sambaconf - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} - ) -@@ -32,7 +33,7 @@ install( FILES - - tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC - SOURCES propertiespage.cpp propertiespagegui.ui -- DEPENDENCIES filesharesamba -+ DEPENDENCIES filesharesamba_generate_headers - ) - - -diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp -index 5ff1af7..6042b9e 100644 ---- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp -+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp -@@ -44,9 +44,9 @@ - #include "../nfs/nfsdialog.h" - - // Samba related --#include "../kcm_sambaconf/sambafile.h" --#include "../kcm_sambaconf/sambashare.h" --#include "../kcm_sambaconf/sharedlgimpl.h" -+#include "sambafile.h" -+#include "sambashare.h" -+#include "sharedlgimpl.h" - - #include "propertiespage.h" - diff --git a/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild b/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild deleted file mode 100644 index a9fa878d..00000000 --- a/trinity-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.13.1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -TRINITY_MODULE_NAME="kdenetwork" - -inherit trinity-meta - -DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc" -KEYWORDS="amd64 x86" -IUSE="" - -PATCHES=( "${FILESDIR}/kdenetwork-bug1330i2-fix-filesharing-parallel-compilation.patch" ) diff --git a/trinity-base/kdenetwork-filesharing/metadata.xml b/trinity-base/kdenetwork-filesharing/metadata.xml deleted file mode 100644 index 6e9f5e4a..00000000 --- a/trinity-base/kdenetwork-filesharing/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>fatzer2@gmail.com</email> - <name>Alexander Golubev</name> - </maintainer> -</pkgmetadata> |