Remove KDE 4.8

4.10 has been the default for a while.
This commit is contained in:
Eelco Dolstra 2013-10-07 17:12:50 +02:00
parent db091a6662
commit 9faba5f073
155 changed files with 0 additions and 3498 deletions

View file

@ -1,60 +0,0 @@
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
release = "4.8.4";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
inherit release ignoreList extraSubpkgs callPackage;
};
# The list of igored individual modules
ignoreList = {
# Doesn't work yet
kdeutils = [ "ksecrets" ];
# kdeadmin/strigi-analyzer has no real code
kdeadmin = [ "strigi-analyzer" ];
# kdesdk/kioslave is splitted into kioslave-svn and kioslave-git
kdesdk = [ "kioslave" ];
# Most of kdebindings do not compile due to a bug in the buildsystem
kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
};
# Extra subpackages in the manifest format
extraSubpkgs = {
kdesdk =
[
{
name = "kioslave-svn";
sane = "kioslave_svn";
subdir = "kioslave";
}
{
name = "kioslave-perldoc";
sane = "kioslave_perldoc";
subdir = "kioslave";
}
];
};
in
kde.modules // kde.individual //
{
inherit (kde) manifest modules individual splittedModuleList;
akonadi = callPackage ./support/akonadi { };
qt4 = qt48;
kdebase_workspace = kde.modules.kde_workspace;
inherit release;
full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n {
inherit release;
inherit (kde.manifest) stable;
};
}

View file

@ -1,17 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3e247..f78db67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
+project(kde-wallpapers NONE)
+if( WALLPAPER_INSTALL_DIR )
+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
+else()
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+endif()
install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)

View file

@ -1,12 +0,0 @@
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
@@ -139,7 +139,7 @@
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, shared_desktop_ontologies }:
kde {
propagatedBuildInputs = [ kdelibs shared_desktop_ontologies ];
meta = {
description = "KDE activities library and daemon";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }:
kde {
buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ];
meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
license = "GPLv2";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs, kde_baseapps }:
kde {
buildInputs = [ kdelibs kde_baseapps ];
meta = {
description = "Konsole, the KDE terminal emulator";
license = "GPLv2";
};
}

View file

@ -1,299 +0,0 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="0g3k6i9ncl8m8xr85wz6k0vbmjq7jwmygm0353jq2lj2hy5i2ipg";}
{name="ark";value="10m6bmiz4ylgbmxx03q0zfayy1zinxx696jczmllxn557z75nzn5";}
{name="blinken";value="1n0m70by3wd5d4nqlgqrm6bg0nplc3b92cn74xq5adi1dfi63ggr";}
{name="cantor";value="1grjxbzyshc9jlmx9gvxfsxdhcgrn391s3bh0mmprnk0kcsi4s5i";}
{name="filelight";value="1fpkwyz74nqm0szfylbjqfxwv25rgfdg03ghq5mncs2ys8mh4rn1";}
{name="gwenview";value="1xxkhq4psl3zq0ah6fp42s5ih1xik0kxq4sb2r2mhkimrsj11rvz";}
{name="jovie";value="103d7c1h3qfqsh6phyxm4g712kykkpd1vls26kypn3d6linc9p1s";}
{name="kaccessible";value="0s772i8nc1lx6c8sjsy3m928dcyackd8pay44b8nlp8k8hzh5x62";}
{name="kactivities";value="0kxpg0bwr9ph3bzndc5vqgfqkxy443chyg3rbrdvgbgb0xm54r5f";}
{name="kalgebra";value="0p5qhxwd6h8kvfd8n81ah0pszaa550z7y2zlzvrgypmfcgx8a802";}
{name="kalzium";value="17sxslsg5pi1xh7l0h6y0rmjhb6nshq9psjjjqwhfl7id6ansb24";}
{name="kamera";value="0r8rr4lq3jrvfz2fw4in83vsxqjm02x16h842r4hnn3k5svaqs49";}
{name="kanagram";value="02wp2rkm5m6920rvs6iyalvv4xczgh21w1mrf4a694j14fna4m1n";}
{name="kate";value="0530rq6pfrim2mfjkvpl9qxv56fykml7aq3awchyda3xbkq7vk3y";}
{name="kbruch";value="1znm2dmsib7svyfqpyhblip5ic4y2xdylax1kxx7ssmjgsi3bw54";}
{name="kcalc";value="1dv3d833ksz9bqrwhq9pbsqk0a8hv3jlqlxbqccwgkx840hmpclz";}
{name="kcharselect";value="015pj1zmlnjr8ys3arks3b1yqf8rh9fc02p0xfq1fkp11ing0lfg";}
{name="kcolorchooser";value="04360b4pjsdl0ckdwipn3y407fmsx2bimkzqqm01hz4vdyb41d9k";}
{name="kdeadmin";value="0qvynvim50xsv060598bhv6pwxd578sg25g1z2dzdi4ih021nlr0";}
{name="kdeartwork";value="1v5an8385d9zjb29ps94xgvpazpvqffxnlvfp4940pj5imdg98nm";}
{name="kde-baseapps";value="0z2jasna2d8i3iy8w4grylfml9a510imhl0bxnsw6whar409rzki";}
{name="kdegames";value="1jji5dw9qllhv7zh7a456iwwsb5vqrvjd0p871s2qi8lcd54fs1a";}
{name="kdegraphics-mobipocket";value="1ya4jzj864ikw6ysp9ip1ha2n6a8im380k4yhmca9agp5f21zvva";}
{name="kdegraphics-strigi-analyzer";value="1cwvaszjawzdbvggxzzaxvxdjpxmr9x4p4fqy4wq38qzx06lnsd1";}
{name="kdegraphics-thumbnailers";value="1zxvqzadmcsy5ydxx617gpfh3vswcrnyjwn19scy1cv7nwdpxnqj";}
{name="kdelibs";value="1wr0kadmc33kqbr93h05g6yxqwp66cgs9ab32danvqbfns0qgb15";}
{name="kdemultimedia";value="0h56vy27kb1s4p3vpa42gj3xjbpwl38n97bbjq7g1vj8dq2k0pl4";}
{name="kdenetwork";value="10lyrygi3avfiyaqxgw9g6dc3pmsbggawjvnkxhm8f2j2gy7sbbc";}
{name="kdepim";value="0q4fq26gg3hfmvxzfbizsa1ffk88a994k31ybbv72b7xcdjz68ff";}
{name="kdepimlibs";value="1wqi7dh1w3cinkd8sgc0zx9qf7fyvizli4asbimxh5faal1b10bb";}
{name="kdepim-runtime";value="1v1klgcfa0hwi7bxqn0nphd7hlbxwh3v6apghra0b8f7qqnzxysp";}
{name="kdeplasma-addons";value="1f4bpgrjqa9c1ikngc9wn3a0y0hw39icswc77ys4j04b9zazg8qn";}
{name="kde-runtime";value="0g2jlxfxm4flx1pr920hbmqaq433y8bdglk08vnhycychppkacmc";}
{name="kdesdk";value="15zg649sm851ig7yxcsv9cx54x36k94y83q1wvm1kf84jb1vl1yg";}
{name="kdetoys";value="038h6fmqfy7mh2i7kg3510w0jwji9hac94dpzfmfgk36i461dbnn";}
{name="kde-wallpapers";value="18hbd9d19yf48vs4vmxrrxvr87baxxlf3z417f69kgvjpvmpl905";}
{name="kdewebdev";value="1mv5nq8ayz5np1vmgk58dsai6wmqdl1kvq96pvi5awmhxxla2f5x";}
{name="kde-workspace";value="12vn117nbqxipvb58v7swc4prfddijz7m0c03xn5wi1kbzq5xj9n";}
{name="kdf";value="0alc9a7x75f8dx5gbhdqwn0xfx7kr5q7dl9qfmcmrgm9vn6agxpw";}
{name="kfloppy";value="0ajc3yq86n4q7hxjgibvkrbbagg7xnlbd6g7mx3cvmq9l7na105b";}
{name="kgamma";value="1yviy8xz8cqlbpvjj7sp9jylq4lk98r3mpp6lxl95ypkjqbjx8w3";}
{name="kgeography";value="0wklqqprg7d7mxjlwfyv4n5d2igkr6b2i174vxzdhj9dbsh9r67f";}
{name="kgpg";value="034mg0s5v0vqq59x1fwddslg6r2dx3v70icka6j2r9lhi8635j5m";}
{name="khangman";value="0b64pqywvxdxrbp3xcscimdlsn44hwlvm6ydxiwx2salm2rn9xxa";}
{name="kig";value="0cblkm71j78dq4r90r9fladn8nxq3xq75w40f85jl9dkmm1y3yiv";}
{name="kimono";value="1ij7bcvxv8zkfzcrmjasq6x0nf41104x5bj6ksfc8mibml182bq7";}
{name="kiten";value="1c3rdagddk0xd0j6vnp0bj16in78879niakvq1s35s7grgxh31ia";}
{name="klettres";value="0sxd3hwpzyzvjrvly0w2fwrssg4a9rs35fp9yi6in19x7x8rbsxl";}
{name="kmag";value="0fgddhsf9f5n4crzp4z2ii5p1asyvpbmsiqgb61kswqbpsr96mv8";}
{name="kmousetool";value="0f4ym6dihq9wmwaassap0ixam46lqjvf6jqkr6ib0y87myj3h9mi";}
{name="kmouth";value="1hpphlav8ip4kx3787p3dkfddkzpgg4mj25ripjcpy0xpbfvc2lw";}
{name="kmplot";value="19sab4hmdv8kwipgjzg4v3gq4lv1i17yh4hdq3y6lcyf7wjkxjpd";}
{name="kolourpaint";value="0mr4f1vbhg3vhap92f8jj5lkpfr8cjphn863vda49rfdydhv1x6w";}
{name="konsole";value="10fgjsq2dj56ifnzxy3dz87s92m2zfcmpqa751b5ar0wp3pil045";}
{name="korundum";value="0vkhf40ghbqgs9vxl7zpfq21r7sc9z4rm0iyl9cab04wvi9r2nsk";}
{name="kremotecontrol";value="11z0wc9yvpk72yrx9ic3zpky2z346wdkvs8qcik9nfbbxxpk4vnx";}
{name="kross-interpreters";value="0afqwxxsysd7wwl5xgwdw58q7hjr8y5sdvsfrz8sfkirinfdmp9s";}
{name="kruler";value="19xppbxvyw6qzgxz4y1yzz9g104464z1i7dvsd3919njqhsrm628";}
{name="ksaneplugin";value="0z2gkc0997s79haf2nxgg5xgvmpk5iz2s33147qhhy12hys6jq9m";}
{name="ksecrets";value="1f4n3x5rmc0l16q3bripk49mj0nyak6s3vf3v7j4g89qz8rr4c87";}
{name="ksnapshot";value="069v2qs4nl8514kdgcp6y03n1n4d6ymm5j5yq1wwrgij6iqc7a78";}
{name="kstars";value="1hl0z77cl317pm442lcd2hk6rb83hvch904a0jgflcxcd2w0gg54";}
{name="ktimer";value="1hf0sbl9y0a9w2xdxdl88lmv55skz7fp1kl9sgnsyj8gzjyv3nwa";}
{name="ktouch";value="00hij38zk469ja3ns9d7qpj91kyndwrnmf0v2fqd2nicv9mqxdih";}
{name="kturtle";value="0wvskx6cif0gsgvsc072i33jl58bp2n74vyl2qgbw4bibckp9aq8";}
{name="kwallet";value="1n4vl0gvr8sqh8ld0bmz3qdz8lws19vzndrp10xl5fmb40cibdsz";}
{name="kwordquiz";value="1w2xwfqz3bjmm0rg4pn08vgm7f0m1wr2bc8cwgjayc8105xy572h";}
{name="libkdcraw";value="0fpx8yprgrk6sg03xms8swgqb7b41ia2rnf9n5phm5hvbpwwbw9f";}
{name="libkdeedu";value="1nz53vjmd48x9vk73wrfz6k94drxv0w2nsa0nnh68q1mphxm8cz3";}
{name="libkexiv2";value="1w7h8ckq2b7pi6qdf8p7rk6jzpn5caxflzdczlaxa7jn84k4rsjn";}
{name="libkipi";value="02cdmqjky5sfwpz9m85yixkmcsh9ybjdspsi8dwhypndpq3pgj3w";}
{name="libksane";value="11wgzdccwix4whfdj8f7fyapxk9yp8jfra56s9gyn7a4sfgp40sp";}
{name="marble";value="09ph1lg3y6bzkxdnpwbhlysj9s56fbaxwsxpn2ydwg4vnsspspiy";}
{name="okular";value="06xd3xpm1hp2dk382p4sd2dj2gdwb1f4d97hkh67riddwwzlcdal";}
{name="oxygen-icons";value="0zw6kv456gf955ip28iykx8nmd4h0scpqdj4f035yqiyxms9p4g1";}
{name="parley";value="1mg5mkxlzrb1clnclsfcl4vpd8yn97asgcazlq9wmgr077z0f9yd";}
{name="perlkde";value="1k94rfchpi7nvzvwz2flx49ni92aw6x8cc6qnq1vr98j9hangjg4";}
{name="perlqt";value="0rjwd2d2jlqlsjvw6w198jb79kjib89p3gbslj4dfgblrq1cgrdq";}
{name="printer-applet";value="1y8r39dyc04bkqm33s65m77c6y4y19bi32v2cx5bl67w5377hvh0";}
{name="pykde4";value="0gnzqw2xj1swm2jr728fxb7l48ll8whvc4ranwcvx8920jdd8vk7";}
{name="qtruby";value="1ixb8kav1pxpkwar99p3cgwi6nql1dfjwmyq7ai2h8ls7g075gz8";}
{name="qyoto";value="07m64n9xlnpgmw6jj91vwyzzjnmwn9px3ckfi93qs4mgnsj263zi";}
{name="rocs";value="0zxdskps9ifc8yhrk6lngjsh4abp98pv7d9y48lw830jhy78bm57";}
{name="smokegen";value="08yzxg6x3bdpza7hld1bd1ils5ipav2laazcar811vsn70lr8rqy";}
{name="smokekde";value="1k8r7d82mbmilg2x565w9nwxb5x6xfznscqwv9vmsgync56nk982";}
{name="smokeqt";value="036128q7mz5701ikw7fjc22ygkmnlscckmlgv3nb8d914maa1cl0";}
{name="step";value="1i1334p7qlc84m8xjc4sp20pmnqal26y8854pcv7lh8r3xzyscd6";}
{name="superkaramba";value="05xgflb9ramhrqb6avqagxp1kcdax6qwdf1k6wm85l8ys6vjimry";}
{name="svgpart";value="0xrs93njmp5322m4dh3ycvwgl9p618kzsi5xmrnlksb9n0hi91gw";}
{name="sweeper";value="1gcyffzzap2gdxk3js43bllf87795f97i0lmykgyllhp364czv6x";}
];
modules=[
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ksecrets"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="printer-applet"; sane="printer_applet"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kate"; }
{ name="kde-baseapps"; sane="kde_baseapps"; }
{ name="konsole"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="kcron"; }
{ name="ksystemlog"; }
{ name="system-config-printer-kde"; sane="system_config_printer_kde";}
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
{ name="aurorae"; }
];
}
{ module="kdegames"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdemultimedia"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kfile-plugins"; sane="kfile_plugins";}
{ name="kget"; }
{ name="kopete"; }
{ name="krdc"; }
{ name="kppp"; }
{ name="krfb"; }
{ name="kdnssd"; }
{ name="filesharing"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
{ module="kdesdk"; split=false;
pkgs=[
{ name="cervisia"; }
{ name="lokalize"; }
{ name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
{ name="kcachegrind"; }
{ name="kapptemplate"; }
{ name="kpartloader"; }
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kioslave"; }
{ name="okteta"; }
{ name="kmtrace"; }
{ name="kompare"; }
{ name="kprofilemethod"; }
{ name="kstartperf"; }
{ name="kuiviewer"; }
{ name="poxml"; }
{ name="scripts"; }
{ name="umbrello"; }
];
}
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

View file

@ -1,128 +0,0 @@
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
, release, ignoreList, extraSubpkgs
}:
let
inherit (stdenv.lib) filter fold;
inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
in
rec {
manifest = import (./. + "/${release}.nix");
# src attribute for $name tarball
kdesrc = name: fetchurl {
url = "mirror://kde/" + (if manifest.stable then "" else "un")
+ "stable/${release}/src/${name}-${release}.tar.xz";
sha256 = getAttr name manifest.hashes;
};
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers;
};
# KDE package built from the whole tarball
# This function is used both for monolithic modules and modules which are
# released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc name;
meta = defMeta // meta;
enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
# API.
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
# Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; in
a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
cmakeFlags =
[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE"
"-DBUILD_${subdir}=TRUE"
] ++ cmakeFlags;
meta = defMeta // meta;
enableParallelBuilding = module.enableParallelBuilding or true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
# Combine packages in one module.
# Arguments:
# * pkgFun --- a function of the following signature:
# module: manifest_attrs: manual_attrs: derivation;
# * module --- name of the module
# * pkgs --- list of packages in manifest format
combinePkgs = pkgFun: module: pkgs:
let
f = p@{name, ...}:
callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
list = map f pkgs;
attrs = listToAttrs (map
({name, sane ? name, ...}@p: { name = sane; value = f p; })
pkgs);
in
runCommand "${module}-${release}"
({passthru = attrs // {
propagatedUserEnvPackages = list;
projects = attrs;
};})
''
mkdir -pv $out/nix-support
echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
'';
# Given manifest module data, return the module
kdeModule = { module, sane ? module, split, pkgs ? [] }:
let
pkgs_ = filterPkgs module pkgs;
in
# Module is splitted by upstream
if split then combinePkgs kdeSplittedPkg module pkgs_
# Monolithic module
else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
# Module is splitted by us
else combinePkgs kdeSubdirPkg module pkgs_;
# The same, as nameValuePair with sane name
kdeModuleNV = a@{ module, sane ? module, ... }:
{ name = sane; value = kdeModule a; };
filterPkgs = module: (p:
removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
# Remove attrsets with x.name in subst. Optimized for empty subst.
removeNames = subst: big:
fold (s: out: filter (x: x.name != s) out) big subst;
modules = listToAttrs (map kdeModuleNV manifest.modules);
splittedModuleList =
let
splitted = filter (a: a ? pkgs) manifest.modules;
names = map ({module, sane ? module, ...}: sane) splitted;
in
map (m: m.projects) (stdenv.lib.attrVals names modules);
individual =
stdenv.lib.zipAttrsWith
(
name: list:
if tail list == []
then head list
else abort "Multiple modules define ${name}"
)
splittedModuleList;
}

View file

@ -1,146 +0,0 @@
#! /bin/sh
# Usage: download kde release to $dir, then run
# $0 $dir
dir="$1"
# Detect release number & whether it is a stable release
if [[ ! -d "${dir}" ]]; then
echo "${dir} is not a directory (or doesn't exist)!" >&2
exit 1
fi
release=$(ls "${dir}"/kdelibs-*.tar.xz | \
sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
if [[ ${release##*.} -gt 50 ]]; then
stable="false"
else
stable="true"
fi
echo "Detected release ${release}" >&2
declare -A hash
declare -A modules
declare -a packages
declare -a top_level
# xsltproc output declares -A module
if [[ ! -f kde_projects.xml ]]; then
curl -O -J http://projects.kde.org/kde_projects.xml
fi
eval `xsltproc kde-submodules.xslt kde_projects.xml`
module[kde-baseapps]=kde-baseapps
unset module[kactivities]
print_sane() {
echo "Called print_sane $1" >&2
sane="${1//[^a-z0-9_]/_}"
if [[ "$sane" != "$1" ]]; then
echo "Sane version is $sane" >&2
echo -n "sane=\"$sane\";"
fi
}
for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
package=${i%-${release}.tar.xz}
packages+=( "$package" )
echo -n "${package}.. " >&2
hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo -n ${hash[$package]} >&2
if [ -n "${module[$package]}" ]; then
m="${module[$package]}"
echo " (${m})" >&2
modules[$m]=1
else
top_level+=( "$package" )
echo " (top-level)" >&2
fi
#nix-store --add-fixed sha256 "${dir}/${i}" >&2
done
print_pkg_hash() {
echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
}
print_hashes(){
echo "hashes=builtins.listToAttrs["
for p in "${packages[@]}"; do print_pkg_hash "$p"; done
echo "];"
}
print_split_module(){
echo -n "$1:" >&2
echo -e "{\n module=\"$1\";"
print_sane "$1"
echo " split=true;"
echo " pkgs=["
for p in "${packages[@]}"; do
if [[ "${module[$p]}" == "$1" ]]; then
echo -n " { name=\"$p\"; "
print_sane "$p"
echo " }"
echo -n " $p" >&2
fi
done
echo " ];"
echo "}"
echo >&2
}
print_mono_module(){
echo -en "{ module=\"$1\"; "
print_sane "$1"
echo -n "$1 ... " >&2
echo -n " split=false;"
cml="$1-$release/CMakeLists.txt"
tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
echo " is monolithic (has unconditionally added subdirs)" >&2
else
subdirs=( `grep '^[^#]*add_subdirectory' $cml |
sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
grep -v '\(doc\|cmake\)'` )
echo " seems splittable, subdirs: ${subdirs[*]}" >&2
echo -e "\n pkgs=["
for s in "${subdirs[@]}"; do
echo -en " {"
echo -n " name=\"${s//\//-}\"; "
print_sane "$s"
if [[ $s != "${s//\//-}" ]]; then
echo -n "subdir=\"$s\"; "
fi
echo "}"
done
echo -e " ];\n"
fi
else
echo " is monolithic (has no subdirs)" >&2
fi
rm $cml
rmdir $1-$release
echo "}"
}
print_modules(){
echo "modules=["
echo "Printing modules splitted by upstream" >&2
for m in "${!modules[@]}"; do print_split_module "$m"; done
echo >&2
echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
for m in "${top_level[@]}"; do print_mono_module "$m"; done
echo "];"
}
echo "Writing ${release}.nix" >&2
exec > "${release}.nix"
echo "{stable=${stable};"
print_hashes
print_modules
echo "}"

View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text" />
<xsl:template match="/">
<xsl:for-each select="kdeprojects/component[@identifier='kde']">
<xsl:text>declare -A module </xsl:text>
<xsl:for-each select="module">
<xsl:variable name="module" select='@identifier' />
<xsl:for-each select=".//project[repo]">
<xsl:text>module["</xsl:text>
<xsl:value-of select='@identifier' />
<xsl:text>"]="</xsl:text>
<xsl:value-of select="$module" />
<xsl:text>" </xsl:text>
</xsl:for-each>
</xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>

View file

@ -1,19 +0,0 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
, networkmanager
}:
kde {
buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager
samba libcanberra ntrack libjpeg qca2 pulseaudio
];
nativeBuildInputs = [ pkgconfig ];
passthru.propagatedUserEnvPackages = [ virtuoso ];
meta = {
license = "LGPL";
};
}

View file

@ -1,17 +0,0 @@
{ kde, cmake }:
kde {
nativeBuildInputs = [ cmake ];
patches = [ ./files/kde-wallpapers-buildsystem.patch ];
cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "b8dfcc905abc46eebac2dd07267879d6a27e6e77f5253eb9c65fe594766770c4";
meta = {
description = "Wallpapers for KDE";
};
}

View file

@ -1,37 +0,0 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
}:
kde {
buildInputs =
[ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate kdepimlibs pam prison akonadi
kactivities
];
nativeBuildInputs = [ pkgconfig ];
preConfigure =
''
# Fix incorrect path to kde4-config.
substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
# Fix the path to the keyboard configuration files.
substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
--replace /usr/share/X11 ${xkeyboard_config}/etc/X11
'';
enableParallelBuilding = false; # frequent problems on Hydra
meta = {
description = "KDE workspace components such as Plasma, Kwin and System Settings";
license = "GPLv2";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, speechd }:
kde {
buildInputs = [ kdelibs speechd ];
meta = {
description = "Text-to-speech synthesis daemon";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, speechd }:
kde {
buildInputs = [ kdelibs speechd ];
meta = {
description = "Bridge that provides accessibility services to applications";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Screen magnifier for KDE";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, libXtst, libXt }:
kde {
buildInputs = [ kdelibs libXtst libXt ];
meta = {
description = "A program that clicks the mouse for you";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A type-and-say front end for speech synthesizers";
};
}

View file

@ -1,5 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
}

View file

@ -1,5 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
}

View file

@ -1,5 +0,0 @@
{ kde, kdelibs, kdepimlibs }:
kde {
buildInputs = [ kdelibs kdepimlibs ];
}

View file

@ -1,33 +0,0 @@
{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
kdelibs, kdepimlibs, pykde4, cups, nettools }:
let s_c_p = system_config_printer.override { withGUI = false; }; in
kde {
buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
pygobject s_c_p ];
passthru = { system_config_printer = s_c_p; };
preConfigure =
''
for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
substituteInPlace $i \
--replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \
--replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
--replace /bin/hostname ${nettools}/bin/hostname
done
'';
postInstall =
''
# Bake the required Python path into the printer configuration program.
res=
for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
-e "1 a import sys\nsys.path = [$res] + sys.path"
mkdir -p $out/nix-support
echo ${pykde4} > $out/nix-support/propagated-user-env-packages
'';
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde {
name = "kde-color-schemes";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE color schemes";
};
}

View file

@ -1,73 +0,0 @@
#Macro to find xscreensaver directory
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (NOT XSCREENSAVER_FOUND)
FIND_PATH(XSCREENSAVER_DIR deco
HINTS
${KDE4_INCLUDE_DIR}
PATHS
/usr
/usr/local
/opt/local
/usr/X11R6
/opt/kde
/opt/kde3
/usr/kde
/usr/local/kde
/usr/local/xscreensaver
/usr/openwin/lib/xscreensaver
/etc
PATH_SUFFIXES
lib${LIB_SUFFIX}/xscreensaver
lib${LIB_SUFFIX}/misc/xscreensaver
lib/xscreensaver
lib64/xscreensaver
lib/misc/xscreensaver
libexec/xscreensaver
bin/xscreensaver-hacks
hacks)
message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
PATHS
${KDE4_INCLUDE_DIR}
/usr/
/usr/local/
/opt/local/
/usr/X11R6/
/opt/kde/
/opt/kde3/
/usr/kde/
/usr/local/kde/
/usr/openwin/lib/xscreensaver/
/etc/
PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
)
MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
endif(NOT XSCREENSAVER_FOUND)
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
# Need to fix hack
if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
set(XSCREENSAVER_FOUND TRUE)
endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
if (XSCREENSAVER_FOUND)
if (NOT Xscreensaver_FIND_QUIETLY)
message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
endif (NOT Xscreensaver_FIND_QUIETLY)
else (XSCREENSAVER_FOUND)
if (Xscreensaver_FIND_REQUIRED)
message(FATAL_ERROR "XScreenSaver not found")
endif (Xscreensaver_FIND_REQUIRED)
endif (XSCREENSAVER_FOUND)
MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde rec {
name = "kde-wallpapers-high-resolution";
buildInputs = [ kdelibs ];
meta = {
description = "KDE wallpapers in high resolution";
};
}

View file

@ -1,13 +0,0 @@
{ kde, kdelibs }:
kde {
name = "kdeartwork-icon-themes";
# Sources contain primary and kdeclassic as well but they're not installed
buildInputs = [ kdelibs ];
meta = {
description = "KDE nuvola and mono icon themes";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde rec {
name = "kde-weather-wallpapers";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE wallpapers (weather)";
};
}

View file

@ -1,7 +0,0 @@
{ kde, kdelibs }:
kde {
name = "aurorae-themes";
buildInputs = [ kdelibs ];
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde {
name = "kde-desktop-themes";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE desktop themes";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde {
name = "kde-emotion-icons";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE emotion icons (smiles)";
};
}

View file

@ -1,15 +0,0 @@
{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
kde {
buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
nativeBuildInputs = [ pkgconfig ];
preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
meta = {
description = "KDE screensavers";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, kde_workspace }:
kde {
buildInputs = [ kdelibs kde_workspace ];
meta = {
description = "Styles for KWin";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde rec {
name = "kde-sounds";
buildInputs = [ kdelibs ];
meta = {
description = "New login/logout sounds";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde rec {
name = "kde-style-phase";
buildInputs = [ kdelibs ];
meta = {
description = "Phase, a widget style for KDE";
};
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs }:
kde rec {
name = "kde-wallpapers";
buildInputs = [ kdelibs ];
meta = {
description = "Additional KDE wallpapers";
};
}

View file

@ -1,19 +0,0 @@
commit 48b92b74bc6fd270c33a726257e2879203cf5064
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 00:47:43 2012 +0400
Include SMOKE_QTCORE_INCLUDE_DIR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48020a1..2263a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt
QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns
Phonon Qwt QSci QImageBlitz)
-include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR})
include(MacroOptionalFindPackage)
include(MacroOptionalAddBindings)

View file

@ -1,118 +0,0 @@
commit e702abfd16f610e773fb0310d8c6512991794c63
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 00:50:02 2012 +0400
Rewrite FindPerlMore.cmake
* Ask perl for expanded paths
* Move execute_process to a macro
* Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX
The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX
instead of perl install prefix.Add debug message
diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake
index 6412a47..cc8faf8 100644
--- a/cmake/FindPerlMore.cmake
+++ b/cmake/FindPerlMore.cmake
@@ -5,54 +5,52 @@
#
# PERL_INCLUDE_PATH = path to where perl.h can be found
-if(PERL_INCLUDE_PATH)
- # Already in cache, be silent
- SET(PERL_HEADERS_FOUND TRUE)
-endif (PERL_INCLUDE_PATH)
-
-IF(PERL_EXECUTABLE)
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
- OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
- OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
- OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
- OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
- OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
- OUTPUT_VARIABLE PERL_VERSION)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
- OUTPUT_VARIABLE PERL_CXX_FLAGS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
- OUTPUT_VARIABLE PERL_CCDL_FLAGS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
- OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
-
- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}"
- OUTPUT_VARIABLE PERL_LIBS)
-
- FIND_PATH(PERL_INCLUDE_PATH
- NAMES perl.h
- PATHS ${PERL_ARCH_LIB_DIR}/CORE
- )
-
- if(PERL_INCLUDE_PATH)
- SET(PERL_HEADERS_FOUND TRUE)
- endif (PERL_INCLUDE_PATH)
-
- MARK_AS_ADVANCED(
- PERL_INCLUDE_PATH
- )
+if(FIND_PERLMORE_REQUIRED)
+ find_package(Perl REQUIRED)
+else()
+ find_package(Perl)
+endif()
+
+macro(_perl_get_config_var name output)
+ execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}"
+ OUTPUT_VARIABLE PERL_${output})
+endmacro()
+
+macro(_perl_get_config_dir name)
+ string(TOLOWER ${name} _tmp)
+ string(REPLACE "_" "" _tmp ${_tmp})
+ _perl_get_config_var(${_tmp}exp ${name}_DIR)
+ string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}")
+endmacro()
+
+if(PERL_EXECUTABLE)
+ _perl_get_config_var(prefixexp ROOT_DIR)
+
+ _perl_get_config_dir(ARCH_LIB)
+ _perl_get_config_dir(SITE_ARCH)
+ _perl_get_config_dir(VENDOR_ARCH)
+ _perl_get_config_dir(SITE_LIB)
+ _perl_get_config_dir(VENDOR_LIB)
+
+ _perl_get_config_var(version VERSION)
+ _perl_get_config_var(ccflags CXX_FLAGS)
+ _perl_get_config_var(ccdlflags CCDL_FLAGS)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+ OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+
+ _perl_get_config_var(perllibs LIBS)
+
+ FIND_PATH(PERL_INCLUDE_PATH
+ NAMES perl.h
+ HINTS ${PERL_ARCH_LIB_DIR}/CORE
+ )
+
+ if(PERL_INCLUDE_PATH)
+ SET(PERL_HEADERS_FOUND TRUE)
+ endif (PERL_INCLUDE_PATH)
+
+ MARK_AS_ADVANCED(PERL_INCLUDE_PATH)
ENDIF(PERL_EXECUTABLE)
IF(PERL_HEADERS_FOUND)

View file

@ -1,454 +0,0 @@
commit c78779fcaff587818ee37bec3ded5e0617625b95
Author: Yury G. Kudryashov [diff odt] <urkud.urkud@gmail.com>
Date: Wed Mar 21 01:01:27 2012 +0400
Install to PERL_SITE_ARCH_INSTALL_DIR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48020a1..16188df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/
add_definitions(-DDEBUG)
include (FindPerlMore)
-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
# the RPATH to be used when installing, but only if it's not a system directory
GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
diff --git a/INSTALL b/INSTALL
index d19f97e..97cc9f1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,7 +36,6 @@ ccmake step.
The standard options are:
CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc)
CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 )
- CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves.
QT_QMAKE_EXECUTABLE = The path to your system's qmake.
cmake looks in your path for a qmake executable. If it can't find it, it will
diff --git a/Makefile.PL b/Makefile.PL
index df9a13c..31dd912 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@
use strict;
use Config;
-my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch});
+my ($prefix, $qmake) = ($Config{prefix});
my @cmakeArgs;
foreach my $arg (@ARGV) {
my $key = $arg;
@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) {
$value =~ s/^[^=]*=//g;
if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') {
$prefix = $value;
- $sitearch = "$prefix";
}
elsif ($key eq 'QMAKE') {
$qmake = $value;
@@ -34,7 +33,6 @@ if($^O =~ /win/i){
}
push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix;
push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake;
-push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch;
push @args, @cmakeArgs;
if ( eval "require Alien::SmokeQt" ) {
diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt
index f2857c3..78674ea 100644
--- a/phonon/lib/CMakeLists.txt
+++ b/phonon/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm)
-install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt
index a04db11..9933dfd 100644
--- a/phonon/src/CMakeLists.txt
+++ b/phonon/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon
set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_phonon PROPERTIES PREFIX "")
-install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt
index 0809ba8..22fc1c0 100644
--- a/qimageblitz/lib/CMakeLists.txt
+++ b/qimageblitz/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm)
-install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt
index 02ef494..4f02c1b 100644
--- a/qimageblitz/src/CMakeLists.txt
+++ b/qimageblitz/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz
set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qimageblitz PROPERTIES PREFIX "")
-install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt
index 63b451f..d22869f 100644
--- a/qsci/lib/CMakeLists.txt
+++ b/qsci/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm)
-install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt
index 8c1659b..bdcb5a8 100644
--- a/qsci/src/CMakeLists.txt
+++ b/qsci/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci
set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qsci PROPERTIES PREFIX "")
-install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt
index 2f04cfa..dda5afa 100644
--- a/qt3support/lib/CMakeLists.txt
+++ b/qt3support/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm)
-install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt
index b24532e..bed99aa 100644
--- a/qt3support/src/CMakeLists.txt
+++ b/qt3support/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4
set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qt3support4 PROPERTIES PREFIX "")
-install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt
index ef07d10..1d78196 100644
--- a/qtcore/lib/CMakeLists.txt
+++ b/qtcore/lib/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory( QtCore4 )
add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm)
-install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} )
+install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} )
diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt
index 44c7893..06aef20 100644
--- a/qtcore/lib/QtCore4/CMakeLists.txt
+++ b/qtcore/lib/QtCore4/CMakeLists.txt
@@ -1,3 +1,3 @@
-install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 )
+install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 )
add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4)
diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt
index 3910636..b5e645c 100644
--- a/qtcore/src/CMakeLists.txt
+++ b/qtcore/src/CMakeLists.txt
@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4
set_target_properties(perlqtcore4 PROPERTIES
OUTPUT_NAME ${libraryName}
PREFIX ""
- INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/
+ INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/
)
-install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h
marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h
QtCore4.h smokehelp.h smokeperl.h util.h
diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt
index d03a672..a60d603 100644
--- a/qtdbus/lib/CMakeLists.txt
+++ b/qtdbus/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm)
-install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt
index 9aa05a0..5786ea2 100644
--- a/qtdbus/src/CMakeLists.txt
+++ b/qtdbus/src/CMakeLists.txt
@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4
set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4")
set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/)
+install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/)
diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt
index e8d2847..b458858 100644
--- a/qtdeclarative/lib/CMakeLists.txt
+++ b/qtdeclarative/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm)
-install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt
index 1662167..ec2a8fc 100644
--- a/qtdeclarative/src/CMakeLists.txt
+++ b/qtdeclarative/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4
set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt
index 82626c8..e62a4ac 100644
--- a/qtgui/lib/CMakeLists.txt
+++ b/qtgui/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm)
-install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt
index 4cc8b36..44041b6 100644
--- a/qtgui/src/CMakeLists.txt
+++ b/qtgui/src/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4
set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtgui4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt
index dcf5ebe..da817d4 100644
--- a/qthelp/lib/CMakeLists.txt
+++ b/qthelp/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm)
-install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt
index c00359d..689cb29 100644
--- a/qthelp/src/CMakeLists.txt
+++ b/qthelp/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4
set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qthelp4 PROPERTIES PREFIX "")
-install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt
index e55f697..5384539 100644
--- a/qtmultimedia/lib/CMakeLists.txt
+++ b/qtmultimedia/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm)
-install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt
index 0728aba..df8e552 100644
--- a/qtmultimedia/src/CMakeLists.txt
+++ b/qtmultimedia/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4
set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt
index 12cd5dd..d1fb0e6 100644
--- a/qtnetwork/lib/CMakeLists.txt
+++ b/qtnetwork/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm)
-install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt
index caf8327..0994d57 100644
--- a/qtnetwork/src/CMakeLists.txt
+++ b/qtnetwork/src/CMakeLists.txt
@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4
set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt
index f3b5640..d8dc9e4 100644
--- a/qtopengl/lib/CMakeLists.txt
+++ b/qtopengl/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm)
-install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt
index 20493a9..777af89 100644
--- a/qtopengl/src/CMakeLists.txt
+++ b/qtopengl/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4
set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt
index d21dbe5..320ff93 100644
--- a/qtscript/lib/CMakeLists.txt
+++ b/qtscript/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm)
-install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt
index dd395be..6ff47d8 100644
--- a/qtscript/src/CMakeLists.txt
+++ b/qtscript/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4
set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtscript4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt
index 59336d3..d9dd4d5 100644
--- a/qtsql/lib/CMakeLists.txt
+++ b/qtsql/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm)
-install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt
index 3ec2028..59096ba 100644
--- a/qtsql/src/CMakeLists.txt
+++ b/qtsql/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4
set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtsql4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt
index 33f6deb..bf1dc1f 100644
--- a/qtsvg/lib/CMakeLists.txt
+++ b/qtsvg/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm)
-install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt
index 11eccd2..449bf0f 100644
--- a/qtsvg/src/CMakeLists.txt
+++ b/qtsvg/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4
set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt
index 3bfa78c..5a8d8da 100644
--- a/qttest/lib/CMakeLists.txt
+++ b/qttest/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm)
-install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt
index 5492e55..d4662b1 100644
--- a/qttest/src/CMakeLists.txt
+++ b/qttest/src/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4
set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qttest4 PROPERTIES PREFIX "")
-install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt
index 119e40e..3a5f472 100644
--- a/qtuitools/lib/CMakeLists.txt
+++ b/qtuitools/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm)
-install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt
index a8ae4a2..ecc079f 100644
--- a/qtuitools/src/CMakeLists.txt
+++ b/qtuitools/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4
set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt
index a02f7ee..3846227 100644
--- a/qtwebkit/lib/CMakeLists.txt
+++ b/qtwebkit/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm)
-install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt
index a6e00f8..dbebc44 100644
--- a/qtwebkit/src/CMakeLists.txt
+++ b/qtwebkit/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4
set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt
index 5505bc4..7db743c 100644
--- a/qtxml/lib/CMakeLists.txt
+++ b/qtxml/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm)
-install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt
index 018508c..a351609 100644
--- a/qtxml/src/CMakeLists.txt
+++ b/qtxml/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4
set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtxml4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt
index a35f3df..3d86103 100644
--- a/qtxmlpatterns/lib/CMakeLists.txt
+++ b/qtxmlpatterns/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm)
-install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt
index 9970a98..563e922 100644
--- a/qtxmlpatterns/src/CMakeLists.txt
+++ b/qtxmlpatterns/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4
set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "")
-install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)
diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt
index 0013c4d..d67ffbf 100644
--- a/qwt/lib/CMakeLists.txt
+++ b/qwt/lib/CMakeLists.txt
@@ -1,2 +1,2 @@
add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm)
-install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/)
+install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/)
diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt
index 869d818..b644e80 100644
--- a/qwt/src/CMakeLists.txt
+++ b/qwt/src/CMakeLists.txt
@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt
set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName})
set_target_properties(perl_qwt PROPERTIES PREFIX "")
-install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/)
+install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/)

View file

@ -1,16 +0,0 @@
{ kde, cmake, smokeqt, perl }:
kde {
buildInputs = [ smokeqt perl ];
nativeBuildInputs = [ cmake ];
patches =
# The order is important
[ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch
./perlqt-use-site-arch-install-dir.patch
];
meta = {
description = "Perl bindings for Qt library";
};
}

View file

@ -1,18 +0,0 @@
diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
index 41fa0fe..642d867 100644
--- a/kpythonpluginfactory/CMakeLists.txt
+++ b/kpythonpluginfactory/CMakeLists.txt
@@ -3,7 +3,12 @@
set(kpythonpluginfactory_SRCS
kpythonpluginfactory.cpp)
-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
+if(HARDCODE_LIB_PYTHON_PATH)
+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
+else(HARDCODE_LIB_PYTHON_PATH)
+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
+endif(HARDCODE_LIB_PYTHON_PATH)
ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)

View file

@ -1,91 +0,0 @@
commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
Author: Luca Beltrame <lbeltrame@kde.org>
Date: Mon Oct 1 20:47:56 2012 +0200
Remove duplicated QVector<int> definition, since it's in PyQt now.
Simon, if you have time, please review if everything is OK.
CCMAIL: simon@simonzone.com
diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
index 5a0a080..73dad01 100644
--- a/sip/kdecore/typedefs.sip
+++ b/sip/kdecore/typedefs.sip
@@ -951,77 +951,3 @@ template <TYPE1>
%End
};
-%MappedType QVector<int>
-{
-%TypeHeaderCode
-#include <qvector.h>
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- for (int i = 0; i < sipCpp->size(); ++i)
- {
- int t = (sipCpp->at(i));
-
-#if PY_MAJOR_VERSION >= 3
- PyObject *tobj = PyLong_FromLong(t);
-#else
- PyObject *tobj = PyInt_FromLong(t);
-#endif
-
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- {
- if (!PyList_Check(sipPy))
- return 0;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-#if PY_MAJOR_VERSION >= 3
- if (!PyNumber_Check(tobj))
-#else
- if (!PyInt_Check(tobj))
-#endif
- return 0;
- }
- return 1;
- }
-
- QVector<int> *qv = new QVector<int>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
- #if PY_MAJOR_VERSION >= 3
- int t = PyLong_AsLong (tobj);
-#else
- int t = PyInt_AS_LONG (tobj);
-#endif
-
- if (*sipIsErr)
- {
- delete qv;
- return 0;
- }
-
- qv->append(t);
- }
-
- *sipCppPtr = qv;
-
- return sipGetState(sipTransferObj);
-%End
-};

View file

@ -1,29 +0,0 @@
{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
boost, lndir }:
let pydir = "lib/python${python.majorVersion}"; in
kde {
buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ];
propagatedBuildInputs = [ pyqt4 sip ];
patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
preConfigure =
''
# Symlink PyQt into PyKDE. This is necessary because PyQt looks
# in its PyQt4/uic/widget-plugins directory for plugins, and KDE
# needs to install a plugin.
mkdir -pv $out/${pydir}
${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
'';
meta = {
description = "Python bindings for KDE";
kde.name = "pykde4";
};
}

View file

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..1a6ad2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
find_package(Ruby REQUIRED)
find_package(Qt4 REQUIRED)
find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt)
-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
+include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
include(MacroOptionalFindPackage)

View file

@ -1,15 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33078b4..30aec0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
return()
endif (NOT COMPILE_RUBY)
-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
# compute an overall version number which can be compared at once
MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")

View file

@ -1,16 +0,0 @@
{ kde, cmake, smokeqt, ruby }:
kde {
buildInputs = [ smokeqt ruby ];
nativeBuildInputs = [ cmake ];
# The second patch is not ready for upstream submmission. I should add an
# option() instead.
patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ];
cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
meta = {
description = "Ruby bindings for Qt library";
};
}

View file

@ -1,46 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79945c4..a244d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,6 @@ set(generator_SRC
type.cpp
)
-# force RPATH so that the binary is usable from within the build tree
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
-set (CMAKE_SKIP_RPATH FALSE)
-
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
add_executable(smokegen ${generator_SRC})
diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
index 947315c..de8d66c 100644
--- a/cmake/SmokeConfig.cmake.in
+++ b/cmake/SmokeConfig.cmake.in
@@ -44,21 +44,19 @@ macro (find_smoke_component name)
set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
find_path(SMOKE_${uppercase}_INCLUDE_DIR
- ${lowercase}_smoke.h
- PATH ${SMOKE_INCLUDE_DIR}
- NO_DEFAULT_PATH
+ ${lowercase}_smoke.h
+ HINTS ${SMOKE_INCLUDE_DIR}
+ PATH_SUFFIXES smoke
)
if(WIN32)
# DLLs are in the bin directory.
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
- NO_DEFAULT_PATH)
+ PATHS "@CMAKE_INSTALL_PREFIX@/bin")
else(WIN32)
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
endif(WIN32)
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)

View file

@ -1,13 +0,0 @@
{ kde, qt4, cmake }:
kde {
buildInputs = [ qt4 ];
nativeBuildInputs = [ cmake ];
patches = [ ./smokegen-nix.patch ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
license = "GPLv2";
};
}

View file

@ -1,12 +0,0 @@
{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, shared_desktop_ontologies, attica }:
kde {
# attica, akonadi and kdepimlibs are disabled due to smokegen crash
buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ];
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
meta = {
description = "SMOKE bindings for kdelibs";
};
}

View file

@ -1,12 +0,0 @@
{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
kde {
propagatedBuildInputs = [ qt4 phonon qimageblitz ];
nativeBuildInputs = [ cmake ];
propagatedNativeBuildInputs = [ smokegen ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
license = "GPLv2";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, readline }:
kde {
buildInputs = [ kdelibs readline ];
meta = {
description = "Library part of KAlgebra";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Memory Enhancement Game";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, libspectre }:
kde {
buildInputs = [ kdelibs libspectre ];
meta = {
description = "KDE Frontend to Mathematical Software";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, libkdeedu, analitza }:
kde {
buildInputs = [ kdelibs libkdeedu analitza ];
meta = {
description = "2D and 3D Graph Calculator";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }:
kde {
buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
meta = {
description = "Periodic Table of Elements";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "Letter Order Game";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Practice Fractions";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Geography Trainer";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "KDE hangman game";
};
}

View file

@ -1,12 +0,0 @@
{ kde, kdelibs, boost, python}:
kde {
buildInputs = [ kdelibs boost python ];
cmakeFlags = ''
-DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
'';
meta = {
description = "KDE Interactive Geometry";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Japanese Reference/Study Tool";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A KDE alphabet tutorial";
};
}

View file

@ -1,12 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A KDE mathematical function plotter";
kde = {
name = "kmplot";
};
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, eigen, xplanet, indilib }:
kde {
buildInputs = [ kdelibs eigen xplanet indilib ];
meta = {
description = "A KDE graphical desktop planetarium";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Touch Typing Tutor";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Educational Programming Environment";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, libkdeedu }:
kde {
buildInputs = [ kdelibs libkdeedu ];
meta = {
description = "Flash Card Trainer";
};
}

View file

@ -1,8 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Libraries used by KDE Education applications";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, gpsd }:
kde {
buildInputs = [ kdelibs gpsd ];
meta = {
description = "Marble Virtual Globe";
};
}

View file

@ -1,9 +0,0 @@
{ kde, kdelibs, libkdeedu, libxml2, attica }:
kde {
buildInputs = [ kdelibs libkdeedu libxml2 attica ];
meta = {
description = "Vocabulary Trainer";
};
}

View file

@ -1,14 +0,0 @@
{ kde, kdelibs, boost }:
kde {
buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
NIX_CFLAGS_COMPILE = "-fexceptions";
meta = {
description = "A KDE graph theory viewer";
kde = {
name = "rocs";
};
};
}

View file

@ -1,12 +0,0 @@
{ kde, kdelibs, gsl, libqalculate, eigen }:
kde {
buildInputs = [ kdelibs gsl libqalculate eigen ];
meta = {
description = "A KDE interactive physical simulator";
kde = {
name = "step";
};
};
}

View file

@ -1,20 +0,0 @@
{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
openal, libsndfile, qhull, sqlite, pkgconfig }:
kde rec {
buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
openal libsndfile qhull sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
nativeBuildInputs = [ pkgconfig ];
# TODO: ggz
postInstall = "wrapPythonPrograms";
meta = {
description = "KDE Games";
license = "GPL";
};
}

View file

@ -1,15 +0,0 @@
{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
, libjpeg, pkgconfig }:
kde {
buildInputs =
[ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
nativeBuildInputs = [ pkgconfig ];
meta = {
description = "Gwenview, the KDE image viewer";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libgphoto2 }:
kde {
buildInputs = [ kdelibs libgphoto2 ];
meta = {
description = "KDE camera interface library";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "A small utility to select a color";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, okular }:
kde {
buildInputs = [ kdelibs okular ];
meta = {
description = "A collection of plugins to handle mobipocket files";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Strigi analyzers for various graphics file formats";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libkexiv2, libkdcraw }:
kde {
buildInputs = [ kdelibs libkexiv2 libkdcraw ];
meta = {
description = "Thumbnailers for various graphics file formats";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libXxf86vm }:
kde {
buildInputs = [ kdelibs libXxf86vm ];
meta = {
description = "KDE monitor calibration tool";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, qimageblitz }:
kde {
buildInputs = [ kdelibs qimageblitz ];
meta = {
description = "KDE paint program";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "KDE screen ruler";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libksane }:
kde {
buildInputs = [ kdelibs libksane ];
meta = {
description = "A KScan plugin that implements the scanning through libksane";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libkipi }:
kde {
buildInputs = [ kdelibs libkipi ];
meta = {
description = "KDE screenshot utility";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, libjpeg, lcms1 }:
kde {
buildInputs = [ kdelibs libjpeg lcms1 ];
meta = {
description = "Library for decoding RAW images";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, exiv2 }:
kde {
buildInputs = [ kdelibs exiv2 ];
meta = {
description = "Exiv2 support library";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "Interface library to kipi-plugins";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs, saneBackends }:
kde {
buildInputs = [ kdelibs saneBackends ];
meta = {
description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
license = "GPLv2";
};
}

View file

@ -1,12 +0,0 @@
{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
, qimageblitz, pkgconfig }:
kde {
buildInputs =
[ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
meta = {
description = "Okular, the KDE document viewer";
license = "GPLv2";
};
}

View file

@ -1,10 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "SVG KPart";
license = "GPLv2";
};
}

View file

@ -1,38 +0,0 @@
{ kde, gcc, cmake, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq, phonon, libjpeg, xz
}:
kde {
buildInputs =
[ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
shared_desktop_ontologies xz udev libxml2 libjpeg kerberos
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];
propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
# TODO: make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths.
# Let kdelibs find openexr
# Split plugins from libs?
patches = [ ./files/polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
];
meta = {
description = "KDE libraries";
license = "LGPL";
};
}

View file

@ -1,15 +0,0 @@
{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
libmusicbrainz3, libtunepimp, pulseaudio }:
kde {
buildInputs =
[ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
flac lame pulseaudio
];
meta = {
description = "KDE multimedia programs such as a movie player and volume utility";
license = "GPL";
};
}

View file

@ -1,19 +0,0 @@
# cmake macro to test msiLBC
# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com>
#
# MSILBC_FOUND
# MSILBC_LIBRARY
include ( FindPackageHandleStandardArgs )
if ( MSILBC_LIBRARY )
set ( MSILBC_FOUND true )
set ( msiLBC_FIND_QUIETLY true )
else ( MSILBC_LIBRARY )
find_library ( MSILBC_LIBRARY NAMES msilbc
PATH_SUFFIXES mediastreamer/plugins)
endif ( MSILBC_LIBRARY )
find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY )
mark_as_advanced ( MSILBC_LIBRARY )

View file

@ -1,7 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

View file

@ -1,24 +0,0 @@
diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt
--- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400
+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400
@@ -28,7 +28,8 @@
set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} )
endif (WIN32)
-find_package(KdepimLibs REQUIRED)
+macro_optional_find_package(KdepimLibs)
+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete")
# find_package(X11VidMode) not used at this time
# NX support is not ready for KDE 4.2; disabled (uwolfer)
@@ -79,7 +80,9 @@
macro_optional_add_subdirectory(kfile-plugins)
macro_optional_add_subdirectory(kget)
-macro_optional_add_subdirectory(kopete)
+if(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kopete)
+endif(KDEPIMLIBS_FOUND)
if(Q_WS_X11)
macro_optional_add_subdirectory(krdc)

View file

@ -1,7 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

View file

@ -1,11 +0,0 @@
{ kde, kdelibs, boost }:
kde {
name = "strigi-analyzer-torrent";
buildInputs = [ kdelibs boost ];
preConfigure = "mv -v strigi-analyzer kfile-plugins";
patches = [ ./kdenetwork.patch ];
}

View file

@ -1,13 +0,0 @@
{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
kde {
buildInputs =
[ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
kde_baseapps gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;
patches = [ ./kdenetwork.patch ];
}

View file

@ -1,24 +0,0 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
libgadu, boost, qca2, gpgme, sqlite }:
kde {
buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
gpgme sqlite ];
nativeBuildInputs = [ pkgconfig ];
KDEDIRS = libktorrent;
patchPhase =
''
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
'';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
meta = {
description = "A KDE multi-protocol IM client";
};
}

View file

@ -1,7 +0,0 @@
{ kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
patches = [ ./kdenetwork.patch ];
}

Some files were not shown because too many files have changed in this diff Show more