summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/extras/knoda/trinity-knoda.spec (renamed from redhat/applications/knoda/trinity-knoda.spec)0
-rw-r--r--redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch11
-rw-r--r--redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch20
-rw-r--r--redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch45
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec6
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch150
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec2
7 files changed, 0 insertions, 234 deletions
diff --git a/redhat/applications/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
index 9b4ef2c77..9b4ef2c77 100644
--- a/redhat/applications/knoda/trinity-knoda.spec
+++ b/redhat/extras/knoda/trinity-knoda.spec
diff --git a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch b/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch
deleted file mode 100644
index fb50a6d6f..000000000
--- a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tdebase/starttde.ORI 2014-04-20 18:05:28.820084805 +0200
-+++ tdebase/starttde 2014-04-20 18:06:08.059237113 +0200
-@@ -81,7 +81,7 @@
-
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
--trap '[starttde] echo GOT SIGHUP' HUP
-+trap 'echo "[starttde] GOT SIGHUP"' HUP
-
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
diff --git a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch b/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
deleted file mode 100644
index 0d73de5a4..000000000
--- a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100
-+++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200
-@@ -5,7 +5,7 @@
- DocPath=kcontrol/index.html
- X-TDE-StartupNotify=true
-
--Name=Control Center
-+Name=Trinity Control Center
- Name[af]=Beheer Sentrum
- Name[ar]=مركز التحكم
- Name[az]=İdarə Mərkəzi
-@@ -28,7 +28,7 @@
- Name[eu]=Kontrol gunea
- Name[fa]=مرکز کنترل
- Name[fi]=Ohjauskeskus
--Name[fr]=Centre de configuration de TDE
-+Name[fr]=Centre de configuration de Trinity
- Name[fy]=Konfiguraasjesintrum
- Name[ga]=Lárionad Rialaithe
- Name[gl]=Centro de Control
diff --git a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch b/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
deleted file mode 100644
index 0a692c42b..000000000
--- a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./kicker/kicker/ui/k_new_mnu.cpp.ori 2013-05-08 21:56:01.084691260 +0200
-+++ ./kicker/kicker/ui/k_new_mnu.cpp 2013-05-08 21:58:02.086130445 +0200
-@@ -1428,6 +1428,42 @@
- m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
- }
-
-+ if ( TDEStandardDirs::exists( TDEGlobalSettings::picturesPath() + "/" ) )
-+ {
-+ TQString picturesPath = TDEGlobalSettings::picturesPath();
-+ if ( picturesPath.endsWith( "/" ) )
-+ picturesPath = picturesPath.left( picturesPath.length() - 1 );
-+ if (picturesPath!=TQDir::homeDirPath())
-+ m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ );
-+ }
-+
-+ if ( TDEStandardDirs::exists( TDEGlobalSettings::musicPath() + "/" ) )
-+ {
-+ TQString musicPath = TDEGlobalSettings::musicPath();
-+ if ( musicPath.endsWith( "/" ) )
-+ musicPath = musicPath.left( musicPath.length() - 1 );
-+ if (musicPath!=TQDir::homeDirPath())
-+ m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ );
-+ }
-+
-+ if ( TDEStandardDirs::exists( TDEGlobalSettings::videosPath() + "/" ) )
-+ {
-+ TQString videosPath = TDEGlobalSettings::videosPath();
-+ if ( videosPath.endsWith( "/" ) )
-+ videosPath = videosPath.left( videosPath.length() - 1 );
-+ if (videosPath!=TQDir::homeDirPath())
-+ m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ );
-+ }
-+
-+ if ( TDEStandardDirs::exists( TDEGlobalSettings::downloadPath() + "/" ) )
-+ {
-+ TQString downloadPath = TDEGlobalSettings::downloadPath();
-+ if ( downloadPath.endsWith( "/" ) )
-+ downloadPath = downloadPath.left( downloadPath.length() - 1 );
-+ if (downloadPath!=TQDir::homeDirPath())
-+ m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ );
-+ }
-+
- m_systemView->insertItem( "network", i18n( "Network Folders" ),
- "remote:/", "remote:/", nId++, index++ );
-
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 0f92dad16..32e461e56 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -82,7 +82,6 @@ Source9: mgabutton.svg
%endif
# Patch party !
-#Patch0: tdebase-14.0.0-ftbfs.patch
# Permanent patches, all TDE versions
## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
@@ -98,9 +97,7 @@ Patch105: tdebase-14.0.0-konsole_wordseps.patch
# Patches from Mandriva
Patch201: tdebase-14.0.0-vibrate_dialog.patch
-Patch202: tdebase-14.0.0-kcontrol_menu_entry.patch
Patch203: tdebase-14.0.0-kdesktop_crossfade.patch
-Patch204: tdebase-14.0.0-kickoff_xdg_dirs.patch
Patch205: tdebase-14.0.0-suspend_unmount.patch
Patch206: tdebase-14.0.0-bookmark_global_copy.patch
@@ -3333,7 +3330,6 @@ Windows and Samba shares.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-#patch0 -p1 -b .ftbfs
%patch101 -p1 -b .openterminalhere
%patch102 -p1 -b .startmenuicon
@@ -3341,9 +3337,7 @@ Windows and Samba shares.
%patch105 -p1 -b .konsolewordseps
%patch201 -p1 -b .vibrate_dialog
-%patch202 -p1 -b .kcontrol_menu_entry
%patch203 -p1 -b .kdesktop_crossfade
-%patch204 -p1 -b .kickoff_xdg
%patch205 -p1 -b .suspend_unmount
%patch206 -p1 -b .bookmark_global_copy
diff --git a/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
deleted file mode 100644
index f32dec25b..000000000
--- a/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- ./tdecore/tdeglobalsettings.h.Ori 2013-05-08 22:16:42.771982104 +0200
-+++ ./tdecore/tdeglobalsettings.h 2013-05-08 22:18:33.882577602 +0200
-@@ -253,6 +253,29 @@
- */
- static TQString documentPath() { initStatic(); return *s_documentPath; }
-
-+ /**
-+ * The path where documents are stored of the current user.
-+ * @return the path of the videos directory
-+ */
-+ static TQString videosPath() { initStatic(); return *s_videosPath; }
-+
-+ /**
-+ * The path where documents are stored of the current user.
-+ * @return the path of the music directory
-+ */
-+ static TQString musicPath() { initStatic(); return *s_musicPath; }
-+
-+ /**
-+ * The path where documents are stored of the current user.
-+ * @return the path of the downloads directory
-+ */
-+ static TQString downloadPath() { initStatic(); return *s_downloadPath; }
-+
-+ /**
-+ * The path where documents are stored of the current user.
-+ * @return the path of the pictures directory
-+ */
-+ static TQString picturesPath() { initStatic(); return *s_picturesPath; }
-
- /**
- * The default color to use when highlighting toolbar buttons.
-@@ -560,6 +583,10 @@
- static TQString* s_autostartPath;
- static TQString* s_trashPath;
- static TQString* s_documentPath;
-+ static TQString* s_picturesPath;
-+ static TQString* s_downloadPath;
-+ static TQString* s_musicPath;
-+ static TQString* s_videosPath;
- static TQFont *_generalFont;
- static TQFont *_fixedFont;
- static TQFont *_toolBarFont;
---- ./tdecore/tdeglobalsettings.cpp.xdg_path 2013-01-09 19:23:09.000000000 +0100
-+++ ./tdecore/tdeglobalsettings.cpp 2013-05-08 22:26:26.451376166 +0200
-@@ -62,6 +62,10 @@
- TQString* TDEGlobalSettings::s_autostartPath = 0;
- TQString* TDEGlobalSettings::s_trashPath = 0;
- TQString* TDEGlobalSettings::s_documentPath = 0;
-+TQString* TDEGlobalSettings::s_videosPath = 0;
-+TQString* TDEGlobalSettings::s_musicPath = 0;
-+TQString* TDEGlobalSettings::s_downloadPath = 0;
-+TQString* TDEGlobalSettings::s_picturesPath = 0;
- TQFont *TDEGlobalSettings::_generalFont = 0;
- TQFont *TDEGlobalSettings::_fixedFont = 0;
- TQFont *TDEGlobalSettings::_toolBarFont = 0;
-@@ -83,7 +87,7 @@
-
- // helper function for reading xdg user dirs: it is required in order to take
- // care of locale stuff
--void readXdgUserDirs(TQString *desktop, TQString *documents)
-+void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures)
- {
- TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
-
-@@ -101,6 +105,14 @@
- *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
- else if (line.startsWith("XDG_DOCUMENTS_DIR="))
- *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+ else if (line.startsWith("XDG_MUSIC_DIR="))
-+ *videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+ else if (line.startsWith("XDG_DOWNLOAD_DIR="))
-+ *download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+ else if (line.startsWith("XDG_VIDEOS_DIR="))
-+ *music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-+ else if (line.startsWith("XDG_PICTURES_DIR="))
-+ *pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
-
- line = s.readLine();
- }
-@@ -515,30 +527,45 @@
- s_autostartPath = new TQString();
- s_trashPath = new TQString();
- s_documentPath = new TQString();
-+ s_videosPath = new TQString();
-+ s_musicPath = new TQString();
-+ s_downloadPath = new TQString();
-+ s_picturesPath = new TQString();
-+
-
- TDEConfigGroup g( TDEGlobal::config(), "Paths" );
-
-- // Read desktop and documents path using XDG_USER_DIRS
-- readXdgUserDirs(s_desktopPath, s_documentPath);
-+ // Read desktop and documents path using XDG_USER_DIRS
-+ readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath);
-
- if (s_desktopPath->isEmpty() == true) {
- *s_desktopPath = TQDir::homeDirPath() + "/Desktop/";
- }
-+
- *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath );
- if ( !s_desktopPath->endsWith("/") )
- s_desktopPath->append('/');
-
-- if (s_documentPath->isEmpty() == true) {
--#ifdef Q_WS_WIN
-- *s_documentPath = getWin32ShellFoldersPath("Personal");
--#else
-- *s_documentPath = TQDir::homeDirPath() + "/Documents/";
--#endif
-- }
- *s_documentPath = TQDir::cleanDirPath( *s_documentPath );
- if ( !s_documentPath->endsWith("/"))
- s_documentPath->append('/');
-
-+ *s_musicPath = TQDir::cleanDirPath( *s_musicPath );
-+ if ( !s_musicPath->endsWith("/"))
-+ s_musicPath->append('/');
-+
-+ *s_videosPath = TQDir::cleanDirPath( *s_videosPath );
-+ if ( !s_videosPath->endsWith("/"))
-+ s_videosPath->append('/');
-+
-+ *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath );
-+ if ( !s_downloadPath->endsWith("/"))
-+ s_downloadPath->append('/');
-+
-+ *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath );
-+ if ( !s_picturesPath->endsWith("/"))
-+ s_picturesPath->append('/');
-+
- // Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons)
- *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
- *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
-@@ -603,6 +630,14 @@
- s_desktopPath = 0L;
- delete s_documentPath;
- s_documentPath = 0L;
-+ delete s_videosPath;
-+ s_videosPath = 0L;
-+ delete s_picturesPath;
-+ s_picturesPath = 0L;
-+ delete s_downloadPath;
-+ s_downloadPath = 0L;
-+ delete s_musicPath;
-+ s_musicPath = 0L;
- }
-
- TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index c865d591b..fa2ada3b3 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -39,7 +39,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
#Patch11: tdelibs-14.0.0-displayconfig_crash.patch
# Patches from Mandriva
-Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch
# Enables the 'kddebug' feature even when built with '-DNDEBUG'
@@ -468,7 +467,6 @@ applications for TDE.
#patch11 -p1 -b .displayconfigcrash
-%patch101 -p1 -b .xdg_path
%patch102 -p1 -b .cups_by_default
#patch201 -p1 -b .kddebug
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 18:21:14 +0000