diff options
author | taca <taca@pkgsrc.org> | 2013-09-29 03:40:32 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-09-29 03:40:32 +0000 |
commit | 905202176266eeda526915748b4c90d35b962615 (patch) | |
tree | c5fda99da36f7e5c5a9a00149aab781f16236557 | |
parent | eb616f5ec787aab9426123e5a76017eeec029aef (diff) | |
download | pkgsrc-905202176266eeda526915748b4c90d35b962615.tar.gz |
Add a patch for serious problem with updater.
Bump PKGREVISION.
-rw-r--r-- | www/contao31/Makefile | 3 | ||||
-rw-r--r-- | www/contao31/PLIST | 6 | ||||
-rw-r--r-- | www/contao31/distinfo | 3 | ||||
-rw-r--r-- | www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php | 20 |
4 files changed, 25 insertions, 7 deletions
diff --git a/www/contao31/Makefile b/www/contao31/Makefile index f1ad998c72d..9cb7b04d1a4 100644 --- a/www/contao31/Makefile +++ b/www/contao31/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2013/08/30 15:46:25 taca Exp $ +# $NetBSD: Makefile,v 1.7 2013/09/29 03:40:32 taca Exp $ # DISTNAME= ${CT_VERSION} PKGNAME= contao${CT_VER}-${CT_PKGVER} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${CT_MASTER_SITE} diff --git a/www/contao31/PLIST b/www/contao31/PLIST index c9e4cc6a23e..b08bd1142a1 100644 --- a/www/contao31/PLIST +++ b/www/contao31/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/08/27 16:08:03 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/09/29 03:40:32 taca Exp $ ${CT_WEBDIR}/.gitignore ${CT_WEBDIR}/README.md ${CT_WEBDIR}/assets/ace/1.0.01/ace.js @@ -3725,7 +3725,3 @@ ${CT_EGDIR}/system/config/timezones.php ${CT_EGDIR}/system/config/tinyFlash.php ${CT_EGDIR}/system/config/tinyMCE.php ${CT_EGDIR}/system/config/tinyNews.php -@pkgdir share/contao31/system/cache -@pkgdir share/contao31/system/config -@pkgdir share/contao31/system/logs -@pkgdir share/contao31/system/tmp diff --git a/www/contao31/distinfo b/www/contao31/distinfo index 9feab44e004..76f1ace6e77 100644 --- a/www/contao31/distinfo +++ b/www/contao31/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2013/08/30 15:46:25 taca Exp $ +$NetBSD: distinfo,v 1.5 2013/09/29 03:40:32 taca Exp $ SHA1 (contao/3.1.2.tar.gz) = ed7d155aa780643480ebedc1617a44faa5671694 RMD160 (contao/3.1.2.tar.gz) = 2ea78a3e5212b898d799b770b7638809b4af2b0b Size (contao/3.1.2.tar.gz) = 9214376 bytes +SHA1 (patch-system_modules_core_library_Contao_Database_Updater.php) = be4f8eeda2237f6c8f47a405b2bd76428f41144e diff --git a/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php b/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php new file mode 100644 index 00000000000..c73b1c8a006 --- /dev/null +++ b/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php @@ -0,0 +1,20 @@ +$NetBSD: patch-system_modules_core_library_Contao_Database_Updater.php,v 1.1 2013/09/29 03:40:32 taca Exp $ + +Workaround for contao 3.1.0 update; make proper update of accordion +content element. + +--- system/modules/core/library/Contao/Database/Updater.php.orig 2013-09-24 08:33:35.000000000 +0000 ++++ system/modules/core/library/Contao/Database/Updater.php +@@ -455,9 +455,9 @@ class Updater extends \Controller + } + + // Adjust the accordion elements +- $this->Database->query("UPDATE `tl_content` SET `type`='accordionStart' WHERE `type`='accordion' AND `mooType`='start'"); +- $this->Database->query("UPDATE `tl_content` SET `type`='accordionStop' WHERE `type`='accordion' AND `mooType`='stop'"); +- $this->Database->query("UPDATE `tl_content` SET `type`='accordionSingle' WHERE `type`='accordion' AND `mooType`='single'"); ++ $this->Database->query("UPDATE `tl_content` SET `type`='accordionStart' WHERE `type`='accordion' AND `mooType`='mooStart'"); ++ $this->Database->query("UPDATE `tl_content` SET `type`='accordionStop' WHERE `type`='accordion' AND `mooType`='mooStop'"); ++ $this->Database->query("UPDATE `tl_content` SET `type`='accordionSingle' WHERE `type`='accordion' AND `mooType`='mooSingle'"); + + // White-space is now in the "alignment" section (see #4519) + $this->Database->query("UPDATE `tl_style` SET `alignment`=1 WHERE `whitespace`!=''"); |