14718 Commits

Author SHA1 Message Date
landry
1f6e967281 Adjust the conflict marker with xfce4-datetime since it will be
resurrected. In the doubtful case someone updates from Xfce 4.2.1, back
in 2007....
2013-12-28 11:02:11 +00:00
ajacoutot
daeb3a76e4 Fix build with --enable-tests. 2013-12-27 12:12:05 +00:00
ajacoutot
1157cfa912 Do the proper chown(1) $USER, root or _gdm dance according to the situation.
prodded by kettenis@
2013-12-26 15:38:29 +00:00
zhuk
b2b3542329 Fix linking problems revealed by KDE3 installed side-by-side. 2013-12-25 17:33:13 +00:00
zhuk
a6ae7fe7b5 Update WANTLIB. 2013-12-25 17:27:29 +00:00
zhuk
c7ad40ff80 Deconflict with kdesdk-3.x. 2013-12-25 17:19:46 +00:00
zhuk
cffa1d49c6 Clean up and add USE_LIBTOOL=gnu, that avoids picking up KDE4 libraries. 2013-12-25 16:32:22 +00:00
zhuk
7c4e959b37 Allow installation side-by-side with kdelibs-4.x. Yes, you've read it right.
Please note: the build tags are NOT removed because some ports have problems
still. They will be fixed as soon as possible, but actual deconflicting has
higher priority now.
2013-12-25 15:47:30 +00:00
zhuk
ff47199ffe Fix conflict marker for -icons. 2013-12-25 15:36:27 +00:00
zhuk
b5cc97aad5 Remove debugging leftover. No bump needed. 2013-12-25 14:58:33 +00:00
zhuk
8fab5c8b41 Deconflict with kdesdk-3.x. 2013-12-25 14:53:27 +00:00
zhuk
14228526f2 Update WANTLIB. 2013-12-25 14:36:06 +00:00
zhuk
12580bd38d Fix linking (avoids picking up libkipi.so from KDE3). 2013-12-25 14:26:52 +00:00
zhuk
558772ee58 Avoid conflict with graphics/libkexiv2, nothing picks up libkexiv2-4.x via
pkg-config anymore.
2013-12-25 14:12:54 +00:00
zhuk
0057bb23b2 Missing ${WANTLIB} in WANTLIB-main here, too. 2013-12-25 14:07:21 +00:00
zhuk
7d3a651800 Fix WANTLIB-main, it was missing ${WANTLIB}. 2013-12-25 13:53:08 +00:00
zhuk
cc54fa276f There is no ${RUN_DEPENDS-common} here, so zap its usage, too. No pkg change. 2013-12-25 13:40:30 +00:00
zhuk
4ab439257b Does not conflict with kdebase-3.x anymore. 2013-12-25 12:16:04 +00:00
zhuk
168224fb81 There are no conflicts with kdelibs-3.x anymore. 2013-12-25 09:14:23 +00:00
zhuk
3c2b383abd Oops, forgot that in previous. Won't build => no bump. 2013-12-25 09:10:24 +00:00
zhuk
2cf87e31db Disable building tests here: this makes kdepimlibs picking up KDE3
libraries. This is either KDE or CMake bug, and should be fixed, but we
have another good reason to do that - build time goes down drastically.
2013-12-25 09:07:17 +00:00
brad
ae1669ba48 Update to FFmpeg 20131216 snapshot. From 1.2 branch.
ok sthen@
2013-12-24 15:22:55 +00:00
zhuk
615e43fafc Enforcing defaults to *.kde3 dirs when building, too. 2013-12-24 10:38:48 +00:00
ajacoutot
74130a2688 Update to libgda-5.2.2. 2013-12-24 08:18:46 +00:00
bcallah
f19413839f Update Sakura to 3.1.3 2013-12-24 05:58:38 +00:00
zhuk
4a87375c06 Make KDE 3 apps look for *.kde3 folders for resources before traditional ones.
This is required to make KDE 3 and 4 co-exist.

Tested on i386 with fat KDE3 profile on many apps, found no regressions.
If you see any (like losing configuration parameters or app data), please,
report immediately. Don't worry, your data is likely to be fine, it's just
the app who cannot find them now. Unfortunately, there is no other way.
2013-12-23 19:23:01 +00:00
zhuk
e7119cfab0 preparetips is only used during KDE development. It's unlikely someone will
ever continue development of localized KDE 3 apps. So comment out this entry
in PLIST.

Now we have no conflicting items between kdelibs-3.x and kdelibs-4.x, but
two more steps need to be done before removing dpb tags from them.
2013-12-23 12:36:50 +00:00
zhuk
cd6cd9af3f Comment out kunittestmodrunner in kdelibs-4.x: it was a compatibility glue
for migrating from KDE3; all KDE4 packages use CTest directly nowadays.
2013-12-22 19:50:42 +00:00
zhuk
68c3beb654 I never committed the splitting -colors diff, actually, so put them back in
the -main.
2013-12-22 19:34:05 +00:00
zhuk
2dfda80395 Oops, missed the main part of previous commit:
Next KDE deconflicting step: rename share/config/ to share/config.kde3/ and
share/config.kcfg/ to share/config.kcfg.kde3/. Tested on i386, including
run-time tests (not for all apps, though).

After this commit, there are only two conflicting files in kdelibs 3.x and
4.x packages left - to be solved soon.

spurring from espie@
2013-12-22 19:29:40 +00:00
zhuk
d04ea22dcb Next KDE deconflicting step: rename share/config/ to share/config.kde3/ and
share/config.kcfg/ to share/config.kcfg.kde3/. Tested on i386, including
run-time tests (not for all apps, though).

After this commit, there are only two conflicting files in kdelibs 3.x and
4.x packages left - to be solved soon.

spurring from espie@
2013-12-22 19:24:33 +00:00
jasper
9bb71a0f92 update to rygel-0.20.3 2013-12-22 14:09:05 +00:00
ajacoutot
37cfaba6af Bring some sftp, http and ftp fixes from upstream. 2013-12-21 13:21:49 +00:00
jasper
9e8d1f656c update to gedit-3.10.3 2013-12-20 21:50:36 +00:00
ajacoutot
f510c1dcfc Add libosinfo support. 2013-12-19 18:06:58 +00:00
bcallah
24bc1ac1fc +worker 2013-12-19 16:45:50 +00:00
bcallah
cd02cec4a3 Import x11/worker. Worker is a Midnight Commander like file manager for X.
Based on a submission from Eivind Evensen <eivinde AT terraplane DOT org>
(taking MAINTAINER).
ok sthen@
2013-12-19 16:45:32 +00:00
zhuk
8c3bdaf86c Does not require desktop-file-utils, mimelnk is KDE-specific directory
which is handled by ksycoca. Zap extra whitespace at the end of WANTLIB
while there.

Both nits pointed out by portcheck.
2013-12-17 11:55:59 +00:00
fgsch
f91bc201ce Hook bcop, ccsm, compizconfig-python, libcompizconfig and plugins-main. 2013-12-17 00:39:39 +00:00
zhuk
682879f1b2 Move Kopete sounds to separate subpackages in KDE 3 and 4.
This is a part of KDE deconflicting work.

Tested in a bulk by landry@
2013-12-16 10:39:51 +00:00
ajacoutot
37bed619b6 Make it clear the run depends on gtk+3 is needed because of pygobject
introspection.
2013-12-16 08:24:04 +00:00
sebastia
b33c131df6 update FisicaLab to 0.3.3
fixing some problems with the English interface, and the data viewer
2013-12-15 09:33:18 +00:00
zhuk
3ad54b313c Tweak conflict markers more: the conflict between libkdcraw and kdelibs was
caused by share/apps/cmake/modules/FindKdcraw.cmake being supplied by both
packages. So:
  1) -icons does not need to have this @conflict at all.
  2) -main should not conflict with kdelibs-3.x and older.
2013-12-15 09:31:21 +00:00
ajacoutot
6998e04526 Update to gob2-2.0.20. 2013-12-15 08:07:28 +00:00
ajacoutot
6ab2085148 Sync patch, libsecret is not needed. 2013-12-14 09:53:18 +00:00
ajacoutot
c6941d9fb2 Don't use non-portable sed -i shell command (upstream). 2013-12-14 08:17:50 +00:00
zhuk
db5a2580b6 Bumps missed in last libkdcraw+libkipi commit.
Noticed by naddy@.
2013-12-13 18:07:04 +00:00
rpe
1e1b05f85d Move elementary.png from top dir of the icon themes to elementary
subdir.

ok aja@
2013-12-13 17:49:50 +00:00
zhuk
7bda448af4 Install browser plugin at the appropriate place. 2013-12-13 16:25:31 +00:00
zhuk
e1f1b1300f Fix (one) crash in googletalk-call. This code is not built yet, so no bump. 2013-12-13 11:34:48 +00:00