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

[Git][xorg-team/app/xdm][debian/latest] 4 commits: debian/patches/1000-fix-hurd-build.patch: Add patch try to fix hurd build.

Title: GitLab

Boyuan Yang pushed to branch debian/latest at X Strike Force / app / xdm

Commits:

  • dd64fb1e
    by Boyuan Yang at 2025-12-09T10:13:19-05:00 
    debian/patches/1000-fix-hurd-build.patch: Add patch try to fix hurd build.
  • e45bdd28
    by Boyuan Yang at 2025-12-09T10:24:01-05:00 
    Update debian/po/ro.po (#1089564)
  • 3a6e31bb
    by Boyuan Yang at 2025-12-09T10:33:35-05:00 
    debian/rule: Avoid calling dpkg-architecture directly
  • 19e00336
    by Boyuan Yang at 2025-12-09T10:41:05-05:00 
    debian/po/sv.po: Convert from ISO-8859-1 to UTF-8 encoding.

6 changed files:

Changes:

  • debian/changelog
    1 
    +xdm (1:1.1.17-2) unstable; urgency=medium
    2 
    +
    3 
    +  [ Remus-Gabriel Chelu ]
    4 
    +  * debian/po/ro.po: Update debconf Romanian PO translation.
    5 
    +    (Closes: #1089564)
    6 
    +
    7 
    +  [ Boyuan Yang ]
    8 
    +  * debian/rules: Avoid directly querying DEB_HOST_* and DEB_BUILD_*
    9 
    +    variables. Use "include /usr/share/dpkg/default.mk" instead.
    10 
    +  * debian/patches/1000-fix-hurd-build.patch: Add patch to try to
    11 
    +    fix hurd build after 1.1.17 release.
    12 
    +  * debian/po/sv.po: Convert from ISO-8859-1 encoding to UTF-8.
    13 
    +
    14 
    + -- Boyuan Yang <byang@debian.org>  Tue, 09 Dec 2025 10:40:36 -0500
    15 
    +
    1 16 
     xdm (1:1.1.17-1) unstable; urgency=medium
    2 17
    3 18 
       * New upstream release 1.1.17 after reviewing each upstream commit.

  • debian/patches/1000-fix-hurd-build.patch
    1 
    +From: Boyuan Yang <byang@debian.org>
    2 
    +Date: Tue, 9 Dec 2025 10:10:11 -0500
    3 
    +Subject: fix hurd build
    4 
    +
    5 
    +The explicit function prototype definition lacks detection of hurd
    6 
    +platform, which causes incompatibility in compiling with getpwnam(3).
    7 
    +Recover the build by detecting __GNU__ macro as well.
    8 
    +
    9 
    +Forwarded: no
    10 
    +---
    11 
    + include/greet.h | 2 +-
    12 
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    13 
    +
    14 
    +diff --git a/include/greet.h b/include/greet.h
    15 
    +index 06eecdb..0061b8c 100644
    16 
    +--- a/include/greet.h
    17 
    ++++ b/include/greet.h
    18 
    +@@ -35,7 +35,7 @@ from The Open Group.
    19 
    + /*
    20 
    +  * Do this rather than break a build over a const-mismatch
    21 
    +  */
    22 
    +-#if defined(__linux__) || defined(CSRG_BASED) || (defined(sun) && defined(SVR4))
    23 
    ++#if defined(__linux__) || defined(CSRG_BASED) || (defined(sun) && defined(SVR4)) || defined(__GNU__)
    24 
    + # define CRYPT_ARGS    const char *s1, const char *s2
    25 
    + # define GETSPNAM_ARGS const char *name
    26 
    + # define GETPWNAM_ARGS const char *name

  • debian/patches/series
    ... ... @@ -12,3 +12,5 @@ support_logfile_rotation.diff
    12 12
    13 13 
     debian.diff
    14 14 
     doc_mention_xdm.options.diff
    15 
    +
    16 
    +1000-fix-hurd-build.patch

  • debian/po/ro.po
    1 
    -# translation of ro.po to Romanian
    2 
    -# debconf templates for xorg-x11 package
    3 
    -#
    1 
    +# Romanian translation of debconf templates for xdm.
    2 
    +# Mesajele în limba română pentru pachetul xdm.
    4 3 
     #
    5 4 
     # Copyright:
    6 5 
     #
    ... ... @@ -26,18 +25,19 @@
    26 25 
     # Eddy Petrișor <eddy.petrisor@gmail.com>, 2007.
    27 26 
     msgid ""
    28 27 
     msgstr ""
    29 
    -"Project-Id-Version: ro\n"
    28 
    +"Project-Id-Version: xdm\n"
    30 29 
     "Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
    31 
    -"POT-Creation-Date: 2007-03-22 06:38+0100\n"
    32 
    -"PO-Revision-Date: 2007-03-24 16:16+0200\n"
    33 
    -"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
    30 
    +"POT-Creation-Date: 2007-03-22 19:35+0100\n"
    31 
    +"PO-Revision-Date: 2024-12-09 01:00+0100\n"
    32 
    +"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
    34 33 
     "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
    34 
    +"Language: ro\n"
    35 35 
     "MIME-Version: 1.0\n"
    36 36 
     "Content-Type: text/plain; charset=UTF-8\n"
    37 37 
     "Content-Transfer-Encoding: 8bit\n"
    38 
    -"X-Generator: KBabel 1.11.4\n"
    39 
    -"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
    38 
    +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
    40 39 
     "20)) ? 1 : 2;\n"
    40 
    +"X-Generator: Poedit 3.5\n"
    41 41
    42 42 
     #. Type: select
    43 43 
     #. Description
    ... ... @@ -52,8 +52,8 @@ msgid ""
    52 52 
     "A display manager is a program that provides graphical login capabilities "
    53 53 
     "for the X Window System."
    54 54 
     msgstr ""
    55 
    -"Un manager de ecran este un program care oferă facilitatea de autentificare "
    56 
    -"grafică sistemului de ferestre X."
    55 
    +"Un manager de ecran este un program care oferă facilități de conectare "
    56 
    +"grafică pentru sistemul X Window."
    57 57
    58 58 
     #. Type: select
    59 59 
     #. Description
    ... ... @@ -63,9 +63,9 @@ msgid ""
    63 63 
     "manager packages are installed. Please select which display manager should "
    64 64 
     "run by default."
    65 65 
     msgstr ""
    66 
    -"Doar un singur manager de ecran poate gestiona un anumit server X, dar acum "
    67 
    -"sunt instalaţi mai mulţi. Selectaţi managerul care ar trebui să pornească în "
    68 
    -"mod implicit."
    66 
    +"Doar un singur manager de ecran poate gestiona un anumit server X, dar sunt "
    67 
    +"instalate mai multe pachete de manager de ecran. Vă rugăm să selectați "
    68 
    +"managerul de ecran care ar trebui să ruleze implicit."
    69 69
    70 70 
     #. Type: select
    71 71 
     #. Description
    ... ... @@ -76,17 +76,17 @@ msgid ""
    76 76 
     "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
    77 77 
     "check for a default display manager."
    78 78 
     msgstr ""
    79 
    -"Mai mulţi manageri de ecran pot rula simultan dacă sunt configuraţi să "
    80 
    -"gestioneze servere diferite; pentru a obţine acest lucru, configuraţi "
    81 
    -"managerii de ecran în mod corespunzător, editaţi fiecare dintre script-urile "
    82 
    -"lor de iniţializare din /etc/init.d şi dezactivaţi testul legat de managerul "
    83 
    -"de ecran implicit."
    79 
    +"Mai mulți manageri de ecran pot rula simultan dacă sunt configurați pentru a "
    80 
    +"gestiona servere diferite; pentru a realiza acest lucru, configurați "
    81 
    +"managerii de ecran în mod corespunzător, editați fiecare dintre scripturile "
    82 
    +"lor de inițializare în „/etc/init.d” și dezactivați verificarea pentru un "
    83 
    +"manager de ecran implicit."
    84 84
    85 85 
     #. Type: boolean
    86 86 
     #. Description
    87 87 
     #: ../xdm.templates:3001
    88 88 
     msgid "Stop the xdm daemon?"
    89 
    -msgstr "Se opreşte serviciul xdm?"
    89 
    +msgstr "Se oprește serviciul «xdm»?"
    90 90
    91 91 
     #. Type: boolean
    92 92 
     #. Description
    ... ... @@ -95,9 +95,9 @@ msgid ""
    95 95 
     "The X display manager (xdm) daemon is typically stopped on package upgrade "
    96 96 
     "and removal, but it appears to be managing at least one running X session."
    97 97 
     msgstr ""
    98 
    -"Serviciul de management al ecranului X (xdm) este, în mod obişnuit, oprit la "
    99 
    -"înnoirea sau ştergerea pachetului, dar acum se pare că acesta gestionează "
    100 
    -"cel puţin o sesiune X."
    98 
    +"Demonul managerului de ecran X (xdm) este de obicei oprit la actualizarea și "
    99 
    +"eliminarea pachetului, dar se pare că acesta gestionează cel puțin o sesiune "
    100 
    +"X care rulează."
    101 101
    102 102 
     #. Type: boolean
    103 103 
     #. Description
    ... ... @@ -107,5 +107,6 @@ msgid ""
    107 107 
     "Otherwise, the new version will take effect the next time the daemon is "
    108 108 
     "restarted."
    109 109 
     msgstr ""
    110 
    -"Dacă xdm este oprit acum, orice sesiune X gestionată de el va fi terminată. "
    111 
    -"Altfel, noua versiune va avea efect la următoarea repornire a serviciului."
    110 
    +"Dacă «xdm» este oprit acum, orice sesiune X pe care o gestionează va fi "
    111 
    +"terminată. În caz contrar, noua versiune va fi aplicată la următoarea "
    112 
    +"repornire a demonului a serviciului."

  • debian/po/sv.po
    ... ... @@ -4,7 +4,7 @@
    4 4 
     #
    5 5 
     # Copyrights:
    6 6 
     # Branden Robinson, 2000-2004
    7 
    -# Andr Dahlqvist, 2001
    7 
    +# André Dahlqvist, 2001
    8 8 
     # Peter Toneby, 2002
    9 9 
     # Mikael Hedin, 2002
    10 10 
     #
    ... ... @@ -51,8 +51,8 @@ msgid ""
    51 51 
     "A display manager is a program that provides graphical login capabilities "
    52 52 
     "for the X Window System."
    53 53 
     msgstr ""
    54 
    -"En displayhanterare r det program som tillhandahller grafiska "
    55 
    -"inloggningsmjligheter i X Window System."
    54 
    +"En displayhanterare är det program som tillhandahåller grafiska "
    55 
    +"inloggningsmöjligheter i X Window System."
    56 56
    57 57 
     #. Type: select
    58 58 
     #. Description
    ... ... @@ -63,8 +63,8 @@ msgid ""
    63 63 
     "run by default."
    64 64 
     msgstr ""
    65 65 
     "Endast en displayhanterare kan hantera en angiven X-server, men flera "
    66 
    -"displayhanterarpaket kan vara installerade. Vlj vilken displayhanterare som "
    67 
    -"skall kras som standard."
    66 
    +"displayhanterarpaket kan vara installerade. Välj vilken displayhanterare som "
    67 
    +"skall köras som standard."
    68 68
    69 69 
     #. Type: select
    70 70 
     #. Description
    ... ... @@ -75,8 +75,8 @@ msgid ""
    75 75 
     "accordingly, edit each of their init scripts in /etc/init.d, and disable the "
    76 76 
     "check for a default display manager."
    77 77 
     msgstr ""
    78 
    -"Flera displayhanterare kan kras samtidigt om de r konfigurerade att "
    79 
    -"hantera olika servrar. Fr att uppn detta ska du konfigurera "
    78 
    +"Flera displayhanterare kan köras samtidigt om de är konfigurerade att "
    79 
    +"hantera olika servrar. För att uppnå detta ska du konfigurera "
    80 80 
     "displayhanterarnas init-skript under /etc/init.d, och inaktivera kontrollen "
    81 81 
     "efter en standarddisplayhanterare."
    82 82
    ... ... @@ -94,7 +94,7 @@ msgid ""
    94 94 
     "and removal, but it appears to be managing at least one running X session."
    95 95 
     msgstr ""
    96 96 
     "X-displayhanterardemonen (xdm) stoppas vanligtvis vid paketuppgradering och "
    97 
    -"borttagning men det verkar som om den hanterar tminstone en krande X-"
    97 
    +"borttagning men det verkar som om den hanterar åtminstone en körande X-"
    98 98 
     "session."
    99 99
    100 100 
     #. Type: boolean
    ... ... @@ -106,5 +106,5 @@ msgid ""
    106 106 
     "restarted."
    107 107 
     msgstr ""
    108 108 
     "Om xdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om "
    109 
    -"inte kommer den nya versionen att bli aktiv nsta gng som demonen startas "
    109 
    +"inte kommer den nya versionen att bli aktiv nästa gång som demonen startas "
    110 110 
     "om."

  • debian/rules
    ... ... @@ -11,6 +11,7 @@
    11 11 
     # set this to the name of the main shlib's binary package
    12 12 
     PACKAGE = xdm
    13 13
    14 
    +include /usr/share/dpkg/default.mk
    14 15 
     include debian/xsfbs/xsfbs.mk
    15 16
    16 17 
     export deb_systemdsystemunitdir := $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
    ... ... @@ -39,11 +40,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    39 40 
     	MAKEFLAGS += -j$(NUMJOBS)
    40 41 
     endif
    41 42
    42 
    -DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
    43 
    -DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
    44 
    -DEB_BUILD_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
    45 
    -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
    46 
    -
    47 43 
     ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
    48 44 
     	confflags += --build=$(DEB_HOST_GNU_TYPE)
    49 45 
     else

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help Notification message regarding https://salsa.debian.org/xorg-team/app/xdm/-/compare/e9189fe320379b5a9902b1056f8e53eafaa06717...19e0033678acb1d2ad182661716748cdacb95f01 at 1765295033

    Reply to: