tde-devels

devels@trinitydesktop.org

1 participants
3754 discussions

Need git HELP - switch_all_ script completely messes up local copy

by David C. Rankin

Guys, I have used the switch_all_submodules_to_head_and_clean script to update repositories that were about a year old. This has totally messed up my local copies. Please note: I DO NOT HAVE ANY LOCAL CHANGES. I JUST WANT TO PULL A FRESH COPY OF NEW/CHANGED FILES FROM THE SERVER. After running the switch_all script 'git status' shows: $ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 8438 and 3318 different commits each, respectively. # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add <file>..." to mark resolution) # # added by us: submodules # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) # # modified: main/applications/abakus (modified content) # modified: main/applications/adept (modified content) # modified: main/applications/amarok (modified content) # modified: main/applications/basket (modified content) # modified: main/applications/bibletime (modified content) # modified: main/applications/compizconfig-backend-kconfig (modified content) # modified: main/applications/desktop-effects-tde (modified content) # modified: main/applications/digikam (modified content) # modified: main/applications/dolphin (modified content) # modified: main/applications/filelight (modified content) # modified: main/applications/fusion-icon (modified content) # modified: main/applications/gtk-qt-engine (modified content) # modified: main/applications/gwenview (modified content) # modified: main/applications/k3b (modified content) # modified: main/applications/k9copy (modified content) # modified: main/applications/kaffeine (modified content) # modified: main/applications/kaffeine-mozilla (modified content) # modified: main/applications/katapult (modified content) # modified: main/applications/kbarcode (modified content) # modified: main/applications/kbfx (modified content) # modified: main/applications/kbookreader (modified content) # modified: main/applications/kchmviewer (modified content) # modified: main/applications/kcpuload (modified content) # modified: main/applications/kdbusnotification (modified content) # modified: main/applications/kdiff3 (modified content) # modified: main/applications/kdirstat (modified content) # modified: main/applications/kdmtheme (modified content) # modified: main/applications/kdpkg (modified content) # modified: main/applications/keep (modified content) # modified: main/applications/kerry (modified content) # modified: main/applications/kgtk-qt3 (modified content) # modified: main/applications/kile (modified content) # modified: main/applications/kima (modified content) # modified: main/applications/kio-apt (modified content) # modified: main/applications/kio-locate (modified content) # modified: main/applications/kio-umountwrapper (modified content) # modified: main/applications/kiosktool (modified content) # modified: main/applications/kmplayer (modified content) # modified: main/applications/kmyfirewall (modified content) # modified: main/applications/kmymoney (modified content) # modified: main/applications/knemo (modified content) # modified: main/applications/knetload (modified content) # modified: main/applications/knetstats (modified content) # modified: main/applications/knetworkmanager8 (modified content) # modified: main/applications/knetworkmanager9 (modified content) # modified: main/applications/knights (modified content) # modified: main/applications/knowit (modified content) # modified: main/applications/knutclient (modified content) # modified: main/applications/koffice (modified content) # modified: main/applications/konversation (modified content) # modified: main/applications/kopete-otr (modified content) # modified: main/applications/kpicosim (modified content) # modified: main/applications/kpilot (modified content) # modified: main/applications/kpowersave (modified content) # modified: main/applications/kradio (modified content) # modified: main/applications/krename (modified content) # modified: main/applications/krusader (modified content) # modified: main/applications/ksplash-engine-moodin (modified content) # modified: main/applications/ksquirrel (modified content) # modified: main/applications/kstreamripper (modified content) # modified: main/applications/ksystemlog (modified content) # modified: main/applications/ktechlab (modified content) # modified: main/applications/ktorrent (modified content) # modified: main/applications/kuickshow (modified content) # modified: main/applications/kvirc (modified content) # modified: main/applications/kvkbd (modified content) # modified: main/applications/piklab (modified content) # modified: main/applications/potracegui (modified content) # modified: main/applications/rosegarden (modified content) # modified: main/applications/smartcardauth (modified content) # modified: main/applications/smb4k (modified content) # modified: main/applications/soundkonverter (modified content) # modified: main/applications/tde-guidance (modified content) # modified: main/applications/tde-style-lipstik (modified content) # modified: main/applications/tde-style-qtcurve (modified content) # modified: main/applications/tde-systemsettings (modified content) # modified: main/applications/tdesudo (modified content) # modified: main/applications/tdesvn (modified content) # modified: main/applications/tellico (modified content) # modified: main/applications/twin-style-crystal (modified content) # modified: main/applications/wlassistant (modified content) # modified: main/applications/yakuake (modified content) # modified: main/dependencies/arts (modified content) # modified: main/dependencies/dbus-1-tqt (modified content) # modified: main/dependencies/dbus-tqt (modified content) # modified: main/dependencies/tqtinterface (modified content) # modified: main/libraries/kipi-plugins (modified content) # modified: main/libraries/libkdcraw (modified content) # modified: main/libraries/libkexiv2 (modified content) # modified: main/libraries/libkipi (modified content) # modified: main/libraries/libksquirrel (modified content) # modified: main/libraries/mlt (modified content) # modified: main/libraries/mlt++ (modified content) # modified: main/libraries/pytdeextensions (modified content) # modified: main/libraries/python-trinity (modified content) # modified: main/tde-i18n (modified content) # modified: main/tdeaccessibility (modified content) # modified: main/tdeaddons (modified content) # modified: main/tdeadmin (modified content) # modified: main/tdeartwork (modified content) # modified: main/tdebase (modified content) # modified: main/tdebindings (modified content) # modified: main/tdeedu (modified content) # modified: main/tdegames (modified content) # modified: main/tdegraphics (modified content) # modified: main/tdelibs (modified content) # modified: main/tdemultimedia (modified content) # modified: main/tdenetwork (modified content) # modified: main/tdepim (modified content) # modified: main/tdesdk (modified content) # modified: main/tdetoys (modified content) # modified: main/tdeutils (modified content) # modified: main/tdevelop (modified content) # modified: main/tdewebdev (modified content) # no changes added to commit (use "git add" and/or "git commit -a") On a second box after trying all the suggested "git add" and "git commit -a", I am left with: 11:25 providence:~/tde/tde> git status # On branch master # Your branch and 'origin/master' have diverged, # and have 9509 and 3318 different commits each, respectively. # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) # # modified: experimental (new commits) # modified: main/applications/kdmtheme (modified content) # modified: main/applications/kio-apt (modified content) # modified: main/applications/kio-locate (modified content) # modified: main/applications/kio-umountwrapper (modified content) # modified: main/applications/knetworkmanager9 (modified content) # modified: main/applications/kpowersave-nohal (modified content) # modified: main/applications/kradio (modified content) # no changes added to commit (use "git add" and/or "git commit -a") But nothing else will help for those files. Further, the content of the local copy does not match the content on http://git.trinitydesktop.org/cgit/scripts/tree/ 11:28 providence:~/tde/tde> ll scripts/ total 24 -rwxr-xr-x 1 david david 1571 Dec 31 01:17 commit_all_submodules -rw-r--r-- 1 david david 128 Dec 31 01:17 README -rwxr-xr-x 1 david david 1463 Dec 31 01:17 switch_all_submodules_to_head_and_clean -rwxr-xr-x 1 david david 1940 Dec 31 01:17 update_all_submodules I have tried every from of git commit command either (1) suggested by git in the error messages or (2) from https://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving… Nothing works. Why does the switch script not simply: "throw away any changes and get a fresh copy of the source" That is exactly what I want to do -- how can I do that? I do not want to waste the bandwidth to pull new copies of the code on 3 different servers, but I've exhausted all suggestions I can find. How do I fix this? -- David C. Rankin, J.D.,P.E.

11 years, 1 month

Re: [trinity-devel] Where are we capturing suggested default config changes?

by Darrell Anderson

> I was unclear. I was looking for a wiki page where we could post >suggested >changes to default values for apps, etc.. such as akregatorrc: > >[Browser] >Close Button On Tabs=true That kind of discussion probably is deep in the mail list archives or an etherpad. File an enhancement request and explain why the change should be made. :) Darrell

11 years, 1 month

Re: [trinity-devel] Minimum Trinity system requirements

by Darrell Anderson

>In preparation for the R14.0.0 release, we would like to establish > >minimum system requirements for installing and running Trinity. >Please refrain from "by gosh, by gum" guessing. :-) Please only >share real-world experiences using Trinity with older hardware and > >distros as well as limited environments, such as the Raspberry Pi >or ARM. > >We don't want to create absurd minimum requirements as has >popular. >We want to establish realistic minimum requirements. > >Thank you! Tim has been fine-tuning Trinity code based upon his own testing of a Raspberry Pi and me with a PI and PII. We've been conducting these tests for about two weeks. My test specs: PI: 400 MHz K6-III+, 256 MB RAM (the maximum possible), ATA hard drive, 66 MHz FSB, Diamond Stealth 3000 3D video card (4 MB RAM). This was my primary system at the turn of the century. :) PII: 350 MHz Deschutes CPU, 448 MB RAM (expandable only to 768 MB), ATA hard drive, 100 MHz FSB, Creative Banshee AGP (16 MB RAM). Direct rendering actually works on this first generation AGP card. :) Precise scientific testing method: stopwatch and eyeballs. :) In my original tests with the PI and PII, the original Trinity startup time was about 1:45. Tests as of today are down to about 1:05. All of the recent testing and patching is, very much, a success. Other tests were performed but that one result indicates the improvements. Bottom line is Trinity is usable on the PI and PII. For sure I would not want to use these systems all day, yet at least Trinity is palatable on these clunkers. :) As noted previously in this list, the PI and PII are not energy efficient. Much of the time they sit powered off under my desk, but they both serve handily as good hardware to test various aspects of Trinity and corner cases. With this testing we now have a good idea how Trinity performs at the bottom of the hardware barrel. Considering that KDE4 and GNOME are unlikely to run on such systems, that leaves Trinity, Xfce, LXDE/Razor-qt, and E17 as the remaining desktop candidates for REALLY old hardware. That said, window managers likely are optimal at the PI/PII level (not to mention that tasks such as online video and audio streaming will really test a person's patience). Although arguably we showed that a PI or PII could suffice as minimum system requirements, real-world observations indicate such claims should be as a sidenote. If anybody has a P3 available and some time, testing would be welcomed as to whether we can establish a P3 as an reasonable real- world minimum for system requirements. My testing was as simple as this: Trinity startup time. Starting preloaded konqueror. Starting konsole. Alt+F2 dialog. Starting kate. Starting kcontrol. Alt+F1 menu. Darrell

11 years, 1 month

Re: [trinity-devel] Where are we capturing suggested default config changes?

by Darrell Anderson

> At one time we had discussed updating various defaults for >keystrokes, etc. I >have run across an Akregator default change and can't find where >we were listing >them. If I correctly understand your question, most defaults are found in *.ui files. For akregator there are several: tdepim/akregator/src/settings_archive.ui tdepim/akregator/src/settings_appearance.ui tdepim/akregator/src/mk4storage/mk4confwidgetbase.ui tdepim/akregator/src/tagpropertieswidgetbase.ui tdepim/akregator/src/settings_browser.ui tdepim/akregator/src/settings_advancedbase.ui tdepim/akregator/src/propertieswidgetbase.ui tdepim/akregator/src/addfeedwidgetbase.ui tdepim/akregator/src/settings_general.ui Darrell

11 years, 1 month

Where are we capturing suggested default config changes?

by David C. Rankin

All, At one time we had discussed updating various defaults for keystrokes, etc. I have run across an Akregator default change and can't find where we were listing them. -- David C. Rankin, J.D.,P.E.

11 years, 1 month

Re: [trinity-devel] Latest upstream package support for R14.0.0

by Darrell Anderson

>Gotta love arch :) > >cups 1.7.0-2 >libpng 1.6.7-1 Thanks. :) Please let me know when you have a successfully built a full R14 package against those packages. Then I'll bump the press release to those versions. >we also have libpng12. Is R14 still dependent on libpng 1.2.x? Not that I'm aware. Over the months we have updated Trinity with several libpng version-related patches. I recall you being involved in a few of those patches. A few months ago Francois pushed some more such patches. Darrell

11 years, 1 month

LibreOffice 4.1.4 build failure

by Darrell Anderson

Tim, Here is the specific LO build failure: dev/shm/tmp-libreoffice/libreoffice- 4.1.4.2/vcl/Executable_tdefilepicker.mk:18: *** gb_LinkTarget_set_include: include paths /dev/shm/tmp- libreoffice/libreoffice-4.1.4.2/vcl/inc/unx/tde do not exist. Stop. As reported, tmp-libreoffice/libreoffice-4.1.4.2/vcl/inc/unx/tde does not exist. Looking through Executable_tdefilepicker.mk, there is such a respective include directive: -I$(SRCDIR)/vcl/inc/unx/tde. There are additional references in Executable_tdefilepicker.mk to vcl/unx/kde/fpicker, which no longer exists. There is a kde directory and only one file: kdedata.hxx. Looking through the older LO Trinity patches, looks to me like the directory structure has changed in the 4.1.x series. Darrell

11 years, 1 month

Re: [trinity-devel] LibreOffice and Trinity dialogs

by Darrell Anderson

>Some time ago I tested LibreOffice with TDE integration as >available in >LibreOffice-tde PPA on the build-farm. > >I tested version 4.0.3-14 on Debian Wheezy i386 and was very >unuseable. >On the File/Open nothing happened. On the File/Save as occurred >freezing >LibreOffice. I was forced to upgrade to LibreOffice from wheezy- >backports >(4.1.2-2~bpo70+1 without TDE integration). > >Then I tested version 4.0.2-0ubuntu4 on Ubuntu Saucy amd64 and >there >everything worked smoothly. The latest stable is 4.1.4. We should support that. Yesterday I started trying to build LO. A dependency nightmare even after I found a good build script to start with. The 4.1.4 build halts early with failures related to TDE. I was up way too late last night and did not copy the failure message, but I am reasonably sure the failure message means we need to patch the LO 4.1.4 sources. Building LO with Trinity dialogs is going to be a never-ending shuffle to keep LO patched. Nobody upstream is going to do that or even care. Keeping LO patched falls on us. Considering that compiling needs several hours, I ask that we build LO on the server farm and then package as an rpm just like the LO folks do. All Trinity packagers then can take that standard rpm and repackage for their own distro. Building on the server farm will not be a nightly affair. Only build as needed when each new LO version is released. Perhaps two or three times a year. Building on the server farm also guarantees all Trinity packagers that LO is built correctly and provides a common method for all Trinity users to test and validate the Trinity dialogs. As the final LO package is a monster 120+ MB, to control bandwidth we could make the final package available only Trinity packagers and developers. For those who still want to build LO from source with Trinity dialogs, at the wiki we should provide a build script template, a list of required dependencies, a link to git of the respective patches for each LO release version. Right now our draft press release claim of Trinity dialog support is vaporware, at least until we can prove others can build LO successfully with the dialogs. Thoughts? Darrell

11 years, 1 month

Re: [trinity-devel] Dependency issues

by Darrell Anderson

>Since none of the Ubuntu isos worked, I tried installing TDE by >installing an Lubuntu 12.04 cd. Install worked great, updates >worked >great, then I followed the instructions here: > >http://www.trinitydesktop.org/wiki/bin/view/Documentation/UbuntuBin >aryInstallation > >When I tried installing the packages, A LOT of dependency problems >came up. Am I missing anything? Installing TDE has never been a >pain. >I'm converting a Windows user to Linux and I need this computer >working. > >Can someone help? Hi Michael, Just so you know the list is not dead, but several of the main developers are Debian users. Hopefully one of them responds soon. Regarding the ISO not working, the URL looks familiar. I believe one of the Trinity community members hosts those images. At the moment I don't remember who. :( Just a note, perhaps consider installing pre R14 nightly packages rather than 3.5.13.2. R14 is real close to release and the packages are stable. Darrell

11 years, 1 month

Dependency issues

by Michael Henry

Since none of the Ubuntu isos worked, I tried installing TDE by installing an Lubuntu 12.04 cd. Install worked great, updates worked great, then I followed the instructions here: http://www.trinitydesktop.org/wiki/bin/view/Documentation/UbuntuBinaryInsta… When I tried installing the packages, A LOT of dependency problems came up. Am I missing anything? Installing TDE has never been a pain. I'm converting a Windows user to Linux and I need this computer working. Can someone help? -- Bro. Michael Henry Associate Pastor Monticello Christian Church Be kinder than necessary. Everyone you meet is fighting some kind of battle. You never know when a moment and a few sincere words can have an impact on a life for a life

11 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels