3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

57 commits

Author SHA1 Message Date
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Domen Kožar 60ad36ba67 libreoffice: 5.0.0.5 -> 5.0.1.2, refactor
I've extracted some of libraries and made expression simpler.

(cherry picked from commit 66e6f99d40)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-15 05:41:37 +02:00
William A. Kennington III a1c92c4593 libreoffice: Boost 1.59 compat 2015-09-03 17:31:35 -07:00
Tobias Geerinckx-Rice 5f793dda66 Merge pull request #9232 from jraygauthier/jrg/libreoffice_icons_desktop
libreoffice: improvements.
2015-08-31 20:22:34 +02:00
Vladimír Čunát 7c61106bf3 libreoffice: fix URL of libgltf
Reported by @deepfire on IRC.
2015-08-17 15:37:36 +02:00
Raymond Gauthier d12563475a libreoffice: improvements.
Icons no longer missing (fix #5509).

In `*.desktop` files:

 -  Replaced absolute path to the the store by the program name.

    This is so that files can be dragged elsewhere by the user
    (e.g.: desktop, bar) and still work after upgrade + garbage
    collection and can be shared between machines.

 -  Replace program name `soffice` by program name `libreoffice`
    so that we're sure the desktop file really refers to our
    package's binary and not start office or open office.

Add the possibility of building without the help. This build is
not modular and take a really long time to complete so I want
a mean of improving shortcuts without having to rebuild the
whole thing (see #899). A wrapper script is the next step.

Tested (build and ran the program) with `en_US` only and
without the help module.
2015-08-13 08:30:57 -04:00
Michael Raskin db9679259a LibreOffice: Kill one failing test which is fragile elsewhere, too 2015-08-08 16:24:44 +03:00
Michael Raskin 24517d331a Update LibreOffice sources for 5.0.0. 2015-08-08 16:24:44 +03:00
Vladimír Čunát d54659fe96 libreoffice: work around a build problem
Started on staging and just hidden by #7524, most likely.
Now it builds and runs for me. Only the "development build" tag is strange.

/cc #8844, maintainers @viric, @7c6f434c.
2015-07-19 11:21:25 +02:00
Michael Raskin 2d99759e51 LibreOffice: update 4.4.3.2 -> 4.4.4.3 2015-07-05 00:32:54 +03:00
Michael Raskin 9e28f20fe6 Update LibreOffice to 4.4.3.2 2015-05-08 14:47:44 +03:00
Michael Raskin 5c5362427a Let Libreoffice build its orcus on its own 2015-04-05 20:27:26 +03:00
Michael Raskin 07ba92e794 Update LibreOffice to 4.4.2.2 2015-04-05 20:27:26 +03:00
Michael Raskin e5a13b3442 Update LibreOffice to 4.4.1.2 2015-03-09 01:03:01 +03:00
Kosyrev Serge b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Michael Raskin c6dfb67059 Fresh LibreOffice 4.4 at least starts to build 2015-02-01 18:41:33 +03:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Michael Raskin f329eb0137 LibreOffice: install icons 2015-01-01 01:39:31 +03:00
Michael Raskin d7bc5835c8 LibreOffice: 4.3.3.2->4.3.5.2 2014-12-31 23:19:29 +03:00
Bjørn Forsman 64661f0597 libreoffice: fix Exec= in .desktop files
Before we do substitutions, the Exec= line is (currently)
"Exec=libreofficedev4.3 --some-arg". Our substitution logic doesn't handle
that, resulting in broken "Exec=$out/bin/sofficedev4.3 --some-arg"
($out/bin/sofficedev4.3 doesn't exist).

Looking at libreoffice source, the .desktop files refer to a UNIXBASISROOTNAME
variable which come from instsetoo_native/util/openoffice.lst.in. Currently, it
can have one of two values, presumably depending on whether the build is
"normal" or "development":

  libreoffice${major}.${minor}

  libreofficedev${major}.${minor}

Handle both these cases, and also leave the old non-versioned substitution
around, just in case.

Fixes issue #3463.
2014-12-14 18:05:24 +01:00
Michael Raskin b4084d4913 Just use old glm for LO, the rest of LO is not keen on using C++ git add -A 1 2014-12-05 10:51:40 +03:00
Michael Raskin 761e5309b5 Set c++11 standard for LibreOffice build - needed by glm 2014-12-05 09:42:06 +03:00
Michael Raskin 45387d7143 Apparently there is no need to unpack the tarballs on our own as LibreOffice would prefer to unpack them on its own and sometimes fails if we do unpack them 2014-11-09 15:18:12 +03:00
Domen Kožar 555a094326 fix libreoffice build 2014-11-08 14:24:32 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Michael Raskin b61d8d620f Update LibreOffice 2014-11-04 00:37:43 +03:00
William A. Kennington III a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
William A. Kennington III 2de4144bf7 More boost fixes 2014-09-22 19:57:15 -07:00
Michael Raskin 43654cba2c Update LibreOffice to 4.3.1 2014-08-30 18:47:02 +04:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Michael Raskin d06eef88c9 Update libreoffice to the version 4.3.0.4
Also update its dependencies.

Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0

These updates are require by LO update and also require each other.

Note that many of these libraries now require librevenge.

In LibreOffice expression per se:

- Note that liborcus is built separately because it wants Boost to be
  specified in a way that main LO build doesn't ensure.

- libixion from 0.7.0 tarball has libixion-0.8 package version.

- libgltf is in src/libgltf but listed in download.lst without any
  comments.

- Make variable with the name libreoffice-translations-${version}.tar.xz
  and the same value is inserted; the same for -help-. Fetching gives
  a strange error without that. Apparently everyone just builds git
  checkouts.

- There are some conditionals in download.lst that require manual
  handling. I am not sure there is a simple way to process them in
  generate-libreoffice-srcs.sh.
2014-08-12 01:49:54 +04:00
Michael Raskin a72bb396a2 Do not create unneeded local-scope packages; disable a failing test
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
2014-06-28 23:33:42 +04:00
Michael Raskin 7788afd571 Libreoffice update: not succesful yet 2014-06-27 16:37:34 +04:00
Vladimír Čunát d4e1bd4aa6 libreoffice: fix build after mesa update
This is because it uses vanilla pkgconfig,
so it needs Reqires.private deps from mesa during configuration.
2014-05-01 13:08:05 +02:00
Vladimír Čunát 73eead9f13 libreoffice: add deps needed now (libXdmcp, libpthreadstubs)
Configure phase passes now.
2014-03-08 21:25:30 +01:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Eelco Dolstra f03ca20916 libreoffice: Fix path to the JDK 2014-01-25 18:29:21 +01:00
Eelco Dolstra 07a3993e14 libreoffice: Fix path to Ant 2014-01-25 14:19:42 +01:00
Evgeny Egorochkin 8b9269ef66 libreoffice: unbreak .desktop files. Hopefully fixes nixos/nixos#252. 2013-09-18 10:11:54 +03:00
Domen Kožar cf9601dff7 libreoffice: fix build 2013-09-15 00:38:09 +02:00
Domen Kožar 784bda6d30 libreoffice: don't build all languages until we use multiple-outputs to minimize disk usage 2013-09-14 21:49:35 +02:00
Rickard Nilsson d5881add32 libreoffice: Put .desktop-files in correct place 2013-09-03 08:41:52 +02:00
Domen Kožar 43f965f50e libreoffice: correct python version 2013-09-01 20:00:48 +02:00
Domen Kožar 91e98c269f libreoffice: specify number of build cores 2013-09-01 19:56:02 +02:00
Domen Kožar 5e8fbb3dc4 libreoffice: correctly pick python executable 2013-09-01 19:56:01 +02:00
Domen Kožar 670be4c4bc libreoffice: more configure phase dependencies 2013-09-01 12:30:17 +02:00
Domen Kožar 7caf3daafa libreoffice: add missing deps 2013-09-01 11:10:40 +02:00
Domen Kožar 0f06117349 libreoffice: fix eval 2013-09-01 09:59:58 +02:00
Domen Kožar ef8a149b6f libreoffice: 3.6.6.2 -> 4.0.5.2 2013-09-01 01:57:58 +02:00