diff --git a/general.ent b/general.ent index db8ac60025..cf86657302 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + @@ -451,7 +451,7 @@ export -f as_root - + @@ -744,7 +744,7 @@ export -f as_root - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index f90d8aba5b..7675342e92 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -43,6 +43,21 @@ --> + + + June 24th, 2014 + + + [fernando] - Update to samba-4.1.9. Fixes + #5197. + + + [fernando] - Update to inkscape-0.48.5. Fixes + #5196. + + + + June 23rd, 2014 diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml index 8504b79931..eda1ff07cd 100644 --- a/networking/netprogs/samba.xml +++ b/networking/netprogs/samba.xml @@ -6,10 +6,10 @@ - + - + ]> @@ -475,10 +475,10 @@ useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \ libsamba-credentials.so, libsamba-hostconfig.so, libsamba-policy.so, libsamba-util.so, libsamdb.so, libsmbclient-raw.so, libsmbclient.so, libsmbconf.so, libsmbldap.so, libsmbsharemodes.so, libtevent-util.so, - libtorture.so, libwbclient.so, mit_samba.so, the pam_winbind.so and - pam_smbpass.so PAM libraries, winbind_krb5_locator.so, and assorted - character set, filesystem and support modules under - /usr/lib/{python&python2-majorver;,samba} + libtorture.so, libwbclient.so, mit_samba.so, and + winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM + libraries; and assorted character set, filesystem and support module + s under /usr/lib/{python&python2-majorver;,samba} /etc/samba, /run/samba, /usr/include/samba-4.0, /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/Samba{3,4}, diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml index f9cf660ffb..4192a253e5 100644 --- a/xsoft/other/inkscape.xml +++ b/xsoft/other/inkscape.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -79,12 +79,6 @@ - - - Required patch: - - - Inkscape Dependencies @@ -140,20 +134,16 @@ commands: -sed -i src/extension/internal/pdfinput/pdf-parser.cpp \ - -e "/GfxColorSpace::parse/s|NULL|&, NULL|g" \ - -e "/lookupPattern/s:NULL:&, NULL:g" \ - -e "/lookupShading/s:NULL:&, NULL:g" && -patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch && -patch -Np1 -i ../inkscape-&inkscape-version;-freetype-1.patch && -sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h && -./configure --prefix=/usr && +patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch && + +./configure --prefix=/usr && make + Now, as the root user: @@ -164,7 +154,7 @@ make href="../../xincludes/update-icons-and-desktop.xml"/> - + Contents