tde-devels

devels@trinitydesktop.org

11 participants
3781 discussions

by David C. Rankin

Guys, I have a local tree that I converted to 3.5.13-sru. However, not all of the modules switched to sru -- how did that happen? When I try a 'git pull' and 'git submodule init' I get: Module: 'applications/abakus' - current local branch is already 'v3.5.13-sru' U admin U cmake U src/CMakeLists.txt Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. Skipping unmerged submodule admin Skipping unmerged submodule cmake I ran into a few build issues today on one box (can't find 'tde-config') and tracing it back, ran into this problem. I have another local tree that I converted to 3.5.13-sru and it went fine. Now I have to figure out how to 'fix' the one that didn't come all the way to 3513-sru. Here are the packages I'm having issues on: (good) module: applications/desktop-effects-tde branch: v3.5.13-sru available: HEAD master v3.5.13-sru (bad) applications/compizconfig-backend-kconfig branch: master available: HEAD master (it doesn't eve show v3.5.13-sru available) (good) applications/kaffeine-mozilla branch: v3.5.13-sru available: HEAD master v3.5.13-sru (bad) applications/kaffeine-mozilla branch: master available: HEAD master I don't get it ;( I do the same thing on the same packages, but then end up with one tree not going all the way to v3.5.13-sru. To make the switch, I test the local branch against the remote branch, If local is not v3.5.13-sru and remote has v3.5.13-sru available, then I do: git checkout v3.5.13-sru # to switch git pull git submodule update If v3.5.13-sru isn't immediately returned as available, then I try: ## normal reset to head, discard local edits and update git reset --hard HEAD git clean -dxf git pull git reset --hard HEAD git clean -dxf sed -i "s/system@/${gituser}@/g" .gitmodules git submodule init git submodule update --recursive git submodule foreach --recursive "git checkout master" git submodule foreach --recursive "git pull" git checkout -- .gitmodules followed by git checkout v3.5.13-sru # to switch git pull git submodule update Somehow that has ended up with abakus and about 4 other packages in a state where a git pull results in: Module: 'applications/abakus' - current local branch is already 'v3.5.13-sru' U admin U cmake U src/CMakeLists.txt Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution, or use 'git commit -a'. Skipping unmerged submodule admin Skipping unmerged submodule cmake So how to fix? I'm just bewildered by the whole GIT personality.... -- David C. Rankin, J.D.,P.E.

12 years, 8 months

3513-sru Arch summary with ffmpeg 0.11 + cups 1.6 patches applied

by David C. Rankin

Slavek, 3.5.13-sru code built very well with all current commits applied plus the additional patches for cups > 1.6 applied. This was built against the current Arch (latest upstreams for all libs). Full build list: http://www.3111skyline.com/dl/dt/tde/doc/bldlist-x86_64-0814.txt (i686 still building...) -- David C. Rankin, J.D.,P.E.

12 years, 8 months

Konqueror extra tabs

by Calvin Morrison

Hey, when I open anything with konqueror ( eg in a konsole, "konqueror ./" ), it always opens properly, but there is an extra empty tab also open. anyone seen this behavior? Calvin

12 years, 8 months

Update deprecated XKeycodeToKeysym call also for v3.5.13-sru?

by Slávek Banko

François, David, all I noticed patches "Update deprecated XKeycodeToKeysym call" - I seem to be suitable for cherry-pick to v3.5.13-sru. What do you think? Slavek --

12 years, 8 months

tdebase: WITH_HAL=OFF

by Darrell Anderson

Is anybody able to build tdebase without HAL (WITH_HAL=OFF)? Darrell

12 years, 8 months

Bug 1119 - opened to track scope/declaration ftbfs for k3b, k9copy, kdmtheme, krusader

by David C. Rankin

Tim, All, To track the recent handful of ftbfs for k3b, k9copy, kdmtheme, krusader due to scope/declaration issues that have surfaced, I have opened: http://bugs.pearsoncomputing.net/bugzilla/show_bug.cgi?id=1119 That will provide a common point to work from. -- David C. Rankin, J.D.,P.E.

12 years, 8 months

tdevelop FTBFS 3.5.13-sru, error: 'App' was not declared in this scope

by David C. Rankin

Slavek, I think there is a t->k problem in tdevelop/kdevdesigner/designer/listeditor.ui.h:33:5. The error at 89% is: In file included from /build/src/build/kdevdesigner/designer/listeditor.cpp:22:0: /build/src/build/kdevdesigner/designer/listeditor.ui.h: In member function 'virtual void ListEditor::addItem()': /build/src/build/kdevdesigner/designer/listeditor.ui.h:33:5: error: 'App' was not declared in this scope The code is: void ListEditor::addItem() { TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() ); i->setRenameEnabled( 0, TRUE ); 33 tqApp->processEvents(); i->startRename( 0 ); } Is this supposed to be 'qApp' instead of 'tqApp'? I don't know if this is a needed 'tqt-interface' 't' or a stray 't' from the TQt3 rename. What say the experts? -- David C. Rankin, J.D.,P.E.

12 years, 8 months

Slavek: Commit 2864ae94

by Darrell Anderson

Slavek, Should commit 2864ae94 2012-08-12 be applied to tdegraphics/kuickshow too? Darrell

12 years, 8 months

Topic v3.5.13-sru in Etherpad

by Slávek Banko

Hi all, Tim. I wanted to update topic v3.5.13-sru in Etherpad, but I encountered an unexpected problem. Since line 1873 I see only line numbers, but I do not see content. Anything below so I can not edit - or read others :) Any ideas? Move list of changes to the wiki? Thanks Slavek --

12 years, 8 months

Still no working o2_enterprise tdm theme - both R14 and 3513-sru?

by David C. Rankin

All, I need help to find out why I cannot get the new graphical login to display. Instead of the o2_enterprise theme, I get the old xdg login. Here is the R14 shot: http://www.3111skyline.com/dl/dt/trinity/ss/tdm_r14-xdg-screen.jpg The same think in 3.5.13-sru http://www.3111skyline.com/dl/dt/trinity/ss/kdm-3513-sru-xdg-old.jpg The kdmrc & tdmrc are default with 'k' 't' appropriate for each. Here is the kdmrc: [X-*-Core] Setup=/opt/trinity/share/config/kdm/Xsetup Startup=/opt/trinity/share/config/kdm/Xstartup Reset=/opt/trinity/share/config/kdm/Xreset Session=/opt/trinity/share/config/kdm/Xsession AllowRootLogin=false AllowNullPasswd=false AllowShutdown=Root ClientLogFile=.xsession-errors-%s [X-*-Greeter] LogoArea=Logo LogoPixmap=/opt/trinity/share/apps/kdm/pics/kdelogo.png AntiAliasing=true MinShowUID=500 MaxShowUID=65000 UseTheme=true Theme=/opt/trinity/share/apps/kdm/themes/o2_enterprise [X-:*-Core] ServerCmd=/usr/bin/X -br ServerArgsLocal=-nolisten tcp AllowNullPasswd=true AllowShutdown=All [X-:*-Greeter] PreselectUser=Previous FocusPasswd=true LoginMode=DefaultLocal AllowClose=true [X-:0-Core] ClientLogFile=.xsession-errors [X-:0-Greeter] On tdm/kdm start, you can see a momentary message flash in the center of the black screen before the old xdg login dialog appears, but I can't find where that message is logged and it just appears for a fraction of a second. At any rate, I need help figuring out why the o2_enterprise chooser is falling back to the old dialog. One clue is that both the login dialog and logout dialog are 'regular windows' (with window decorations, etc.) instead of pixmaps. I don't know why, but I suspect solving the greeter issue will solve the other... Is anyone else experiencing this problem with their latest builds? It could always be an arch upstream change issue, but I can't figure out how to tell exactly what is failing to tell. Thoughts? Wisdom? -- David C. Rankin, J.D.,P.E.

12 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels