Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5fec761e5e87241cb79cab9dba70fa7b5f532a0f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5fec761e5e87241cb79cab9dba70fa7b5f532a0f)
  • Date: Sun, 11 Dec 2022 04:17:00 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

python-pypi/django/DETAILS | 6 +++---
python-pypi/django/HISTORY | 3 +++
python-pypi/pybbm/DETAILS | 1 +
python-pypi/pybbm/HISTORY | 13 +++++++++++++
python-pypi/pybbm/PRE_BUILD | 3 +++
python-pypi/pybbm/feeds.patch | 11 +++++++++++
python-pypi/pybbm/markitup-multiline.patch | 23 +++++++++++++++++++++++
python-pypi/pybbm/migrations.patch | 28
++++++++++++++++++++++++++++
8 files changed, 85 insertions(+), 3 deletions(-)

New commits:
commit 5fec761e5e87241cb79cab9dba70fa7b5f532a0f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pybbm: update spell

commit c02d3c097b15c6d63e40f50ffa199db33073f91f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

django: updated spell to 1.11.29 (oldstable)

diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index 751e5c0..898d543 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -29,9 +29,9 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL^}-${VERSION}"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL^}-${VERSION}"
;;
oldstable)
- VERSION=1.11.23
-
SOURCE_HASH=sha256:52a66d7f8b036d02da0a4472359e8be1727424fc1e4b4f5c684ef97de7b569e1:UPSTREAM_HASH
- SECURITY_PATCH=5
+ VERSION=1.11.29
+
SOURCE_HASH=sha256:4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c:UPSTREAM_HASH
+ SECURITY_PATCH=6
SOURCE=${SPELL^}-${VERSION}.tar.gz

SOURCE_URL[0]="https://www.djangoproject.com/m/releases/${VERSION}/${SOURCE}";
SOURCE_URL[1]="https://www.djangoproject.com/download/${VERSION}/tarball/";
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index 245c850..a1a7b22 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,6 @@
+2022-12-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.11.29 (oldstable); SECURITY_PATCH++
+
2020-06-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PREPARE: readded oldstable (1.11) branch

diff --git a/python-pypi/pybbm/DETAILS b/python-pypi/pybbm/DETAILS
index c7ce5b6..25f95e3 100755
--- a/python-pypi/pybbm/DETAILS
+++ b/python-pypi/pybbm/DETAILS
@@ -1,5 +1,6 @@
SPELL=pybbm
VERSION=0.19.0
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://pypi.org/packages/source/p/${SPELL}/${SOURCE}

SOURCE_HASH=sha512:a21877285db0f1e8d09a7ad2fba681801e3b60edadf0303f6b2a35bf8fd6cd47e723f5e14e1b27099f1d55da110f0cd478308fd58eeb0b1ebe1417b0947ae0d3
diff --git a/python-pypi/pybbm/HISTORY b/python-pypi/pybbm/HISTORY
index 4015003..c6bc6d9 100644
--- a/python-pypi/pybbm/HISTORY
+++ b/python-pypi/pybbm/HISTORY
@@ -1,3 +1,16 @@
+2022-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * migrations.patch: added
+
+2021-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply patch
+ * feeds.patch: added
+
+2021-06-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply patch
+ * markitup-multiline.patch: added
+
2020-03-21 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply patch
* profile.patch: added
diff --git a/python-pypi/pybbm/PRE_BUILD b/python-pypi/pybbm/PRE_BUILD
index f3da282..bad82db 100755
--- a/python-pypi/pybbm/PRE_BUILD
+++ b/python-pypi/pybbm/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

+patch -p0 < "${SPELL_DIRECTORY}/migrations.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/feeds.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/markitup-multiline.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/profile.patch"
diff --git a/python-pypi/pybbm/feeds.patch b/python-pypi/pybbm/feeds.patch
new file mode 100644
index 0000000..494c9fe
--- /dev/null
+++ b/python-pypi/pybbm/feeds.patch
@@ -0,0 +1,11 @@
+--- pybb/feeds.py.orig 2017-12-06 03:30:35.000000000 +0000
++++ pybb/feeds.py 2021-10-04 01:48:00.985607156 +0000
+@@ -37,7 +37,7 @@
+
+ def items(self, user):
+ ids = [p.id for p in perms.filter_posts(user,
Post.objects.only('id')).order_by('-created', '-id')[:15]]
+- return Post.objects.filter(id__in=ids).select_related('topic',
'topic__forum', 'user')
++ return Post.objects.filter(id__in=ids).select_related('topic',
'topic__forum', 'user').reverse()
+
+
+ class LastTopics(PybbFeed):
diff --git a/python-pypi/pybbm/markitup-multiline.patch
b/python-pypi/pybbm/markitup-multiline.patch
new file mode 100644
index 0000000..b16f3e7
--- /dev/null
+++ b/python-pypi/pybbm/markitup-multiline.patch
@@ -0,0 +1,23 @@
+--- pybb/static/markitup/sets/markdown/set.js.orig 2015-08-18
12:52:42.000000000 +0000
++++ pybb/static/markitup/sets/markdown/set.js 2021-06-28 03:32:06.489728079
+0000
+@@ -24,16 +24,16 @@
+ {name:'Bold', key:'B', openWith:'**', closeWith:'**'},
+ {name:'Italic', key:'I', openWith:'_', closeWith:'_'},
+ {separator:'---------------' },
+- {name:'Bulleted List', openWith:'- ' },
++ {name:'Bulleted List', openWith:'- ', multiline:true},
+ {name:'Numeric List', openWith:function(markItUp) {
+ return markItUp.line+'. ';
+- }},
++ }, multiline:true},
+ {separator:'---------------' },
+ {name:'Picture', key:'P', replaceWith:'![[![Alternative
text]!]]([![Url:!:http://]!] "[![Title]!]")'},
+ {name:'Link', key:'L', openWith:'[',
closeWith:']([![Url:!:http://]!] "[![Title]!]")', placeHolder:'Your text to
link here...' },
+ {separator:'---------------'},
+- {name:'Quotes', openWith:'> '},
+- {name:'Code Block / Code', openWith:'(!(\t|!|`)!)',
closeWith:'(!(`)!)'},
++ {name:'Quotes', openWith:'> ', multiline:true},
++ {name:'Code Block / Code', openWith:'(!(\t|!|`)!)',
closeWith:'(!(`)!)', multiline:true},
+ {separator:'---------------'},
+ {name:'Preview', call:'preview', className:"preview"}
+ ]
diff --git a/python-pypi/pybbm/migrations.patch
b/python-pypi/pybbm/migrations.patch
new file mode 100644
index 0000000..d2f372b
--- /dev/null
+++ b/python-pypi/pybbm/migrations.patch
@@ -0,0 +1,28 @@
+--- /dev/null 2021-03-03 02:51:32.220000000 +0000
++++ pybb/migrations/0008_auto_20221209_1533.py 2022-12-09 15:38:02.067658530
+0000
+@@ -0,0 +1,25 @@
++# -*- coding: utf-8 -*-
++# Generated by Django 1.11.29 on 2022-12-09 15:33
++from __future__ import unicode_literals
++
++from django.db import migrations, models
++
++
++class Migration(migrations.Migration):
++
++ dependencies = [
++ ('pybb', '0007_auto_20170111_1504'),
++ ]
++
++ operations = [
++ migrations.AlterField(
++ model_name='profile',
++ name='autosubscribe',
++ field=models.BooleanField(default=False,
help_text='Automatically subscribe to topics that you answer',
verbose_name='Automatically subscribe'),
++ ),
++ migrations.AlterField(
++ model_name='profile',
++ name='time_zone',
++ field=models.FloatField(choices=[(-12.0, b'-12'), (-11.0,
b'-11'), (-10.0, b'-10'), (-9.5, b'-09.5'), (-9.0, b'-09'), (-8.5, b'-08.5'),
(-8.0, b'-08 PST'), (-7.0, b'-07 MST'), (-6.0, b'-06 CST'), (-5.0, b'-05
EST'), (-4.0, b'-04 AST'), (-3.5, b'-03.5'), (-3.0, b'-03 ADT'), (-2.0,
b'-02'), (-1.0, b'-01'), (0.0, b'00 GMT'), (1.0, b'+01 CET'), (2.0, b'+02'),
(3.0, b'+03'), (3.5, b'+03.5'), (4.0, b'+04'), (4.5, b'+04.5'), (5.0,
b'+05'), (5.5, b'+05.5'), (6.0, b'+06'), (6.5, b'+06.5'), (7.0, b'+07'),
(8.0, b'+08'), (9.0, b'+09'), (9.5, b'+09.5'), (10.0, b'+10'), (10.5,
b'+10.5'), (11.0, b'+11'), (11.5, b'+11.5'), (12.0, b'+12'), (13.0, b'+13'),
(14.0, b'+14')], default=-5.0, verbose_name='Time zone'),
++ ),
++ ]



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5fec761e5e87241cb79cab9dba70fa7b5f532a0f), Vlad Glagolev, 12/10/2022

Archive powered by MHonArc 2.6.24.

Top of Page