[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/pluma][master] 5 commits: Revert "debian/patches: Add 0001_Fix_Pluma_crashes_opening_files_with_bom.patch.…

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / pluma

Commits:

5 changed files:

Changes:

  • debian/changelog
    1 
    +pluma (1.20.3-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +    - Fix crashes when opening files with BOM at beginning (Closes: #912188).
    5 
    +  * debian/copyright:
    6 
    +    + Update copyright attributions.
    7 
    +  * debian/control:
    8 
    +    + Bump Standards-Version: to 4.2.1. No changes needed.
    9 
    +    + List gir1.2-pluma-1.0 under D of pluma-dev, too, so lintian becomes
    10 
    +      happy.
    11 
    +
    12 
    + -- Mike Gabriel <sunweaver@debian.org>  Thu, 22 Nov 2018 12:49:35 +0100
    13 
    +
    1 14 
     pluma (1.20.2-1) unstable; urgency=medium
    2 15
    3 16 
       * New upstream release.

  • debian/control
    ... ... @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 11~),
    23 23 
                    libxml2-dev,
    24 24 
                    mate-common (>= 1.18),
    25 25 
                    yelp-tools,
    26 
    -Standards-Version: 4.1.4
    26 
    +Standards-Version: 4.2.1
    27 27 
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/pluma
    28 28 
     Vcs-Git: https://salsa.debian.org/debian-mate-team/pluma.git
    29 29 
     Homepage: http://www.mate-desktop.org/
    ... ... @@ -87,6 +87,7 @@ Package: pluma-dev
    87 87 
     Architecture: any
    88 88 
     Section: libdevel
    89 89 
     Depends: pluma (= ${binary:Version}),
    90 
    +         gir1.2-pluma-1.0 (= ${binary:Version}),
    90 91 
              ${misc:Depends},
    91 92 
     Breaks: mate-text-editor (<< 1.5.0),
    92 93 
     Description: official text editor of the MATE desktop environment (development files)

  • debian/copyright
    ... ... @@ -429,27 +429,105 @@ Comment:
    429 429 
      Using license from COPYING file.
    430 430
    431 431 
     Files: help/*.in
    432 
    +       help/af/*
    433 
    +       help/am/*
    432 434 
            help/ar/*
    435 
    +       help/as/*
    436 
    +       help/ast/*
    437 
    +       help/az/*
    438 
    +       help/be/*
    433 439 
            help/bg/*
    440 
    +       help/bn/*
    441 
    +       help/bn_IN/*
    442 
    +       help/br/*
    443 
    +       help/bs/*
    434 444 
            help/C/*
    435 445 
            help/ca/*
    446 
    +       help/ca@valencia/*
    447 
    +       help/cmn/*
    448 
    +       help/crh/*
    436 449 
            help/cs/*
    450 
    +       help/cy/*
    437 451 
            help/da/*
    438 452 
            help/de/*
    453 
    +       help/dz/*
    439 454 
            help/el/*
    455 
    +       help/en_AU/*
    456 
    +       help/en_CA/*
    457 
    +       help/en_GB/*
    458 
    +       help/eo/*
    440 459 
            help/es/*
    460 
    +       help/es_AR/*
    461 
    +       help/es_CO/*
    462 
    +       help/et/*
    463 
    +       help/eu/*
    464 
    +       help/fa/*
    441 465 
            help/fi/*
    442 466 
            help/fr/*
    467 
    +       help/frp/*
    468 
    +       help/fur/*
    469 
    +       help/ga/*
    470 
    +       help/gl/*
    471 
    +       help/gu/*
    472 
    +       help/he/*
    473 
    +       help/hi/*
    474 
    +       help/hr/*
    443 475 
            help/hu/*
    476 
    +       help/hy/*
    477 
    +       help/id/*
    478 
    +       help/is/*
    444 479 
            help/it/*
    445 480 
            help/ja/*
    481 
    +       help/ka/*
    482 
    +       help/kk/*
    483 
    +       help/kn/*
    446 484 
            help/ko/*
    485 
    +       help/ku/*
    486 
    +       help/ku_IQ/*
    487 
    +       help/ky/*
    488 
    +       help/lt/*
    489 
    +       help/lv/*
    490 
    +       help/mai/*
    491 
    +       help/mg/*
    492 
    +       help/mk/*
    493 
    +       help/ml/*
    494 
    +       help/mn/*
    495 
    +       help/mr/*
    496 
    +       help/ms/*
    497 
    +       help/nb/*
    498 
    +       help/nds/*
    499 
    +       help/ne/*
    500 
    +       help/nl/*
    501 
    +       help/nn/*
    447 502 
            help/oc/*
    503 
    +       help/or/*
    504 
    +       help/pa/*
    505 
    +       help/pl/*
    506 
    +       help/pluma.pot
    507 
    +       help/ps/*
    508 
    +       help/pt/*
    448 509 
            help/pt_BR/*
    510 
    +       help/ro/*
    449 511 
            help/ru/*
    512 
    +       help/rw/*
    513 
    +       help/si/*
    514 
    +       help/sk/*
    515 
    +       help/sl/*
    516 
    +       help/sq/*
    517 
    +       help/sr/*
    518 
    +       help/sr@latin/*
    450 519 
            help/sv/*
    520 
    +       help/ta/*
    521 
    +       help/te/*
    451 522 
            help/th/*
    523 
    +       help/tr/*
    524 
    +       help/ug/*
    452 525 
            help/uk/*
    526 
    +       help/ur/*
    527 
    +       help/uz/*
    528 
    +       help/vi/*
    529 
    +       help/wa/*
    530 
    +       help/xh/*
    453 531 
            help/zh_CN/*
    454 532 
            help/zh_HK/*
    455 533 
            help/zh_TW/*

  • debian/patches/0001_Fix_Pluma_crashes_opening_files_with_bom.patch deleted
    1 
    -From 8c124726ea8fbf9b6dd2ea5d63b70cb2a29654cc Mon Sep 17 00:00:00 2001
    2 
    -From: Pablo Barciela <scow@riseup.net>
    3 
    -Date: Sun, 19 Aug 2018 05:38:15 +0200
    4 
    -Subject: [PATCH] pluma-document: Fix: don't crash using files with 'bom'
    5 
    -
    6 
    -Fixes https://github.com/mate-desktop/pluma/issues/301
    7 
    ----
    8 
    - pluma/pluma-document.c | 57 +++++++++++++++++++++++++++++++++++++++++-
    9 
    - 1 file changed, 56 insertions(+), 1 deletion(-)
    10 
    -
    11 
    -diff --git a/pluma/pluma-document.c b/pluma/pluma-document.c
    12 
    -index 9364ef1..1e9ca81 100644
    13 
    ---- a/pluma/pluma-document.c
    14 
    -+++ b/pluma/pluma-document.c
    15 
    -@@ -650,12 +650,54 @@ pluma_document_class_init (PlumaDocumentClass *klass)
    16 
    - 	g_type_class_add_private (object_class, sizeof(PlumaDocumentPrivate));
    17 
    - }
    18 
    -
    19 
    -+static gboolean
    20 
    -+file_with_bom (GFile *file)
    21 
    -+{
    22 
    -+	FILE    *testfile;
    23 
    -+	gchar    c;
    24 
    -+	int      i;
    25 
    -+	gchar    bom[3];
    26 
    -+	gchar   *file_path;
    27 
    -+
    28 
    -+	file_path = g_file_get_path (file);
    29 
    -+
    30 
    -+	testfile = fopen (file_path, "r");
    31 
    -+
    32 
    -+	g_free (file_path);
    33 
    -+
    34 
    -+	if (testfile == NULL)
    35 
    -+	{
    36 
    -+		perror ("fopen");
    37 
    -+		return FALSE;
    38 
    -+	}
    39 
    -+
    40 
    -+	for (i = 0; i < 3; i++)
    41 
    -+	{
    42 
    -+		c = fgetc (testfile);
    43 
    -+
    44 
    -+		if (c == EOF)
    45 
    -+			break;
    46 
    -+		else
    47 
    -+			bom[i] = c;
    48 
    -+	}
    49 
    -+
    50 
    -+	fclose (testfile);
    51 
    -+
    52 
    -+	if ((bom[0] == '\357') &&
    53 
    -+	    (bom[1] == '\273') &&
    54 
    -+	    (bom[2] == '\277'))
    55 
    -+		return TRUE;
    56 
    -+	else
    57 
    -+		return FALSE;
    58 
    -+}
    59 
    -+
    60 
    - static void
    61 
    - set_language (PlumaDocument     *doc,
    62 
    -               GtkSourceLanguage *lang,
    63 
    -               gboolean           set_by_user)
    64 
    - {
    65 
    - 	GtkSourceLanguage *old_lang;
    66 
    -+	const gchar       *bom_langs;
    67 
    -
    68 
    - 	pluma_debug (DEBUG_DOCUMENT);
    69 
    -
    70 
    -@@ -664,7 +706,20 @@ set_language (PlumaDocument     *doc,
    71 
    - 	if (old_lang == lang)
    72 
    - 		return;
    73 
    -
    74 
    --	gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (doc), lang);
    75 
    -+	bom_langs = "asp,dtl,docbook,html,mxml,mallard,markdown,mediawiki,php,tera,xml,xslt";
    76 
    -+
    77 
    -+	if (g_strrstr (bom_langs, gtk_source_language_get_id (lang)))
    78 
    -+	{
    79 
    -+		GFile *file;
    80 
    -+		file = pluma_document_get_location (doc);
    81 
    -+
    82 
    -+		if (!file_with_bom (file))
    83 
    -+			gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (doc), lang);
    84 
    -+
    85 
    -+		g_object_unref (file);
    86 
    -+	}
    87 
    -+	else
    88 
    -+		gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (doc), lang);
    89 
    -
    90 
    - 	if (lang != NULL)
    91 
    - 		gtk_source_buffer_set_highlight_syntax (GTK_SOURCE_BUFFER (doc),

  • debian/patches/series deleted
    1 
    -0001_Fix_Pluma_crashes_opening_files_with_bom.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: