- openSUSE Commits

commit istack-commons for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package istack-commons for openSUSE:Factory checked in at 2024-05-16 17:16:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/istack-commons (Old) and /work/SRC/openSUSE:Factory/.istack-commons.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "istack-commons" Thu May 16 17:16:16 2024 rev:8 rq:1174399 version:3.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/istack-commons/istack-commons.changes 2024-04-30 17:28:24.880472631 +0200 +++ /work/SRC/openSUSE:Factory/.istack-commons.new.1880/istack-commons.changes 2024-05-16 17:18:33.035262176 +0200 @@ -1,0 +2,5 @@ +Thu May 16 08:19:05 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Fix build with maven-plugin-plugin >= 3.11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ istack-commons.spec ++++++ --- /var/tmp/diff_new_pack.Dv2joU/_old 2024-05-16 17:18:33.787289432 +0200 +++ /var/tmp/diff_new_pack.Dv2joU/_new 2024-05-16 17:18:33.791289577 +0200 @@ -153,6 +153,11 @@ %pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:executions/pom:execution[pom:id[text()='base-compile']]/pom:configuration/pom:target" "1.8" runtime tools %pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:executions/pom:execution[pom:id[text()='base-compile']]/pom:configuration/pom:jdkToolchain/pom:version" "1.8" runtime tools +%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-plugin-plugin']" " + <configuration> + <goalPrefix>import-properties</goalPrefix> + </configuration>" import-properties-plugin + # backward compatibility symlinks %{mvn_file} com.sun.istack:%{name}-buildtools %{name}-buildtools %{name}/%{name}-buildtools %{mvn_file} com.sun.istack:%{name}-runtime %{name}-runtime %{name}/%{name}-runtime

1 0

commit hppc for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hppc for openSUSE:Factory checked in at 2024-05-16 17:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hppc (Old) and /work/SRC/openSUSE:Factory/.hppc.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hppc" Thu May 16 17:16:15 2024 rev:7 rq:1174398 version:0.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hppc/hppc.changes 2024-02-21 17:59:57.658993741 +0100 +++ /work/SRC/openSUSE:Factory/.hppc.new.1880/hppc.changes 2024-05-16 17:18:30.811181568 +0200 @@ -1,0 +2,5 @@ +Thu May 16 08:18:11 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Fix build with maven-plugin-plugin >= 3.11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hppc.spec ++++++ --- /var/tmp/diff_new_pack.AqvoFA/_old 2024-05-16 17:18:32.455241155 +0200 +++ /var/tmp/diff_new_pack.AqvoFA/_new 2024-05-16 17:18:32.463241445 +0200 @@ -83,6 +83,9 @@ %pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.source" "1.8" %pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.target" "1.8" +%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-plugin-plugin']/pom:configuration" " + <goalPrefix>hppc-template-processor</goalPrefix>" hppc-template-processor + # Convert from dos to unix line ending for file in CHANGES.txt; do sed -i.orig 's|\r||g' $file

1 0

commit cbi-plugins for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cbi-plugins for openSUSE:Factory checked in at 2024-05-16 17:16:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cbi-plugins (Old) and /work/SRC/openSUSE:Factory/.cbi-plugins.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cbi-plugins" Thu May 16 17:16:10 2024 rev:5 rq:1174393 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cbi-plugins/cbi-plugins.changes 2022-01-14 23:14:39.870686865 +0100 +++ /work/SRC/openSUSE:Factory/.cbi-plugins.new.1880/cbi-plugins.changes 2024-05-16 17:18:25.650994544 +0200 @@ -1,0 +2,5 @@ +Thu May 16 08:06:57 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Fix build with maven-plugin-plugin >= 3.11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cbi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.w9YcoN/_old 2024-05-16 17:18:26.155012811 +0200 +++ /var/tmp/diff_new_pack.w9YcoN/_new 2024-05-16 17:18:26.155012811 +0200 @@ -1,7 +1,7 @@ # # spec file for package cbi-plugins # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,6 +82,21 @@ sed -i -e 's/1\.0\.5-SNAPSHOT/1.0.4/' pom.xml sed -i -e 's/1\.2\.3-SNAPSHOT/1.2.2/' common/pom.xml +for i in eclipse-winsigner eclipse-jarsigner eclipse-macsigner eclipse-cbi; +do + %pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin maven-plugins/${i}-plugin " + <configuration> + <goalPrefix>${i}</goalPrefix> + </configuration>" +done +for i in eclipse-dmg-packager eclipse-flatpak-packager; +do + %pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin maven-plugins/${i} " + <configuration> + <goalPrefix>${i}</goalPrefix> + </configuration>" +done + %build # Tests require jimfs which we don't have %{mvn_build} -f -- -f maven-plugins/pom.xml -Dproject.build.sourceEncoding=UTF-8 -Dsource=1.8

1 0

commit schismtracker for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package schismtracker for openSUSE:Factory checked in at 2024-05-16 17:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/schismtracker (Old) and /work/SRC/openSUSE:Factory/.schismtracker.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "schismtracker" Thu May 16 17:16:07 2024 rev:33 rq:1174379 version:20240515 Changes: -------- --- /work/SRC/openSUSE:Factory/schismtracker/schismtracker.changes 2024-05-07 18:05:12.570446543 +0200 +++ /work/SRC/openSUSE:Factory/.schismtracker.new.1880/schismtracker.changes 2024-05-16 17:18:23.278908571 +0200 @@ -1,0 +2,13 @@ +Thu May 16 06:14:41 UTC 2024 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 20240515 + * XM: Improve import routines, autovibrato is now handled + properly. + * STM: More sane import for tempo, similar to OpenMPT. + * S3M: Approximate the SAx command. + * Replayer: Correct playback when a sample sustains after a + portamento. + * Replayer: Emulate IT when an instrument is triggered with a + note that does not map to any sample. + +------------------------------------------------------------------- Old: ---- schismtracker-20240503.source.tar.gz New: ---- schismtracker-20240515.source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schismtracker.spec ++++++ --- /var/tmp/diff_new_pack.B8wYm9/_old 2024-05-16 17:18:23.814927998 +0200 +++ /var/tmp/diff_new_pack.B8wYm9/_new 2024-05-16 17:18:23.818928143 +0200 @@ -17,13 +17,13 @@ Name: schismtracker -Version: 20240503 +Version: 20240515 Release: 0 Summary: Music editor that matches the look and feel of Impulse Tracker License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Editors and Convertors URL: http://schismtracker.org/ -Source: https://github.com/schismtracker/schismtracker/releases/download/%version/s… +Source: https://github.com/schismtracker/schismtracker/releases/download/%version/%… Source2: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff ++++++ schismtracker-20240503.source.tar.gz -> schismtracker-20240515.source.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/configure new/schismtracker-20240515/configure --- old/schismtracker-20240503/configure 2024-05-04 01:36:14.000000000 +0200 +++ new/schismtracker-20240515/configure 2024-05-15 22:03:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for schismtracker 20240503. +# Generated by GNU Autoconf 2.71 for schismtracker 20240515. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -667,8 +667,8 @@ # Identity of this package. PACKAGE_NAME='schismtracker' PACKAGE_TARNAME='schismtracker' -PACKAGE_VERSION='20240503' -PACKAGE_STRING='schismtracker 20240503' +PACKAGE_VERSION='20240515' +PACKAGE_STRING='schismtracker 20240515' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1460,7 +1460,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures schismtracker 20240503 to adapt to many kinds of systems. +\`configure' configures schismtracker 20240515 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1531,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of schismtracker 20240503:";; + short | recursive ) echo "Configuration of schismtracker 20240515:";; esac cat <<\_ACEOF @@ -1657,7 +1657,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -schismtracker configure 20240503 +schismtracker configure 20240515 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2052,7 +2052,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by schismtracker $as_me 20240503, which was +It was created by schismtracker $as_me 20240515, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3325,7 +3325,7 @@ # Define the identity of the package. PACKAGE='schismtracker' - VERSION='20240503' + VERSION='20240515' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -8495,7 +8495,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by schismtracker $as_me 20240503, which was +This file was extended by schismtracker $as_me 20240515, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8563,7 +8563,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -schismtracker config.status 20240503 +schismtracker config.status 20240515 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/fmt/s3m.c new/schismtracker-20240515/fmt/s3m.c --- old/schismtracker-20240503/fmt/s3m.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/fmt/s3m.c 2024-05-15 22:03:47.000000000 +0200 @@ -71,6 +71,7 @@ uint8_t c; uint32_t tmplong; uint8_t b[4]; + uint8_t channel_types[32]; /* parapointers */ uint16_t para_smp[MAX_SAMPLES]; uint16_t para_pat[MAX_PATTERNS]; @@ -153,6 +154,7 @@ special = bswapLE16(special); /* channel settings */ + slurp_read(fp, channel_types, 32); for (n = 0; n < 32; n++) { /* Channel 'type': 0xFF is a disabled channel, which shows up as (--) in ST3. Any channel with the high bit set is muted. @@ -166,7 +168,7 @@ Values past 2F seem to display bits of the UI like the copyright and help, strange! These out-of-range channel types will almost certainly hang or crash ST3 or produce other strange behavior. Simply put, don't do it. :) */ - c = slurp_getc(fp); + c = channel_types[n]; if (c & 0x80) { song->channels[n].flags |= CHN_MUTE; // ST3 doesn't even play effects in muted channels -- throw them out? @@ -390,6 +392,19 @@ } else if (note->param == 0xc0) { note->effect = FX_NONE; note->param = 0; + } else if ((note->param & 0xf0) == 0xa0) { + // Convert the old messy SoundBlaster stereo control command (or an approximation of it, anyway) + uint8_t ctype = channel_types[chn] & 0x7f; + if (gus_addresses > 1 || ctype >= 0x10) + note->effect = FX_NONE; + else if (note->param == 0xa0 || note->param == 0xa2) // Normal panning + note->param = (ctype & 8) ? 0x8c : 0x83; + else if (note->param == 0xa1 || note->param == 0xa3) // Swap left / right channel + note->param = (ctype & 8) ? 0x83 : 0x8c; + else if (note->param <= 0xa7) // Center + note->param = 0x88; + else + note->effect = FX_NONE; } } } @@ -414,7 +429,10 @@ ? "ModPlug Tracker / OpenMPT 1.17" : "ModPlug Tracker 1.0 alpha"; } else if (special == 0 && uc == 0 && flags == 0 && misc == (S3M_UNSIGNED)) { - tid = "Velvet Studio"; + if (song->initial_global_volume == 128 && mix_volume == 48) + tid = "PlayerPRO"; + else // Always stereo + tid = "Velvet Studio"; } else if (uc != 16 && uc != 24 && uc != 32) { // sure isn't scream tracker tid = "Unknown tracker"; @@ -436,7 +454,10 @@ strcpy(song->tracker_id, "Unknown tracker"); break; case 2: - tid = "Imago Orpheus %d.%02x"; + if (trkvers == 0x2013) // PlayerPRO on Intel forgets to byte-swap the tracker ID bytes + strcpy(song->tracker_id, "PlayerPRO"); + else + tid = "Imago Orpheus %d.%02x"; break; case 3: if (trkvers <= 0x3214) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/fmt/stm.c new/schismtracker-20240515/fmt/stm.c --- old/schismtracker-20240503/fmt/stm.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/fmt/stm.c 2024-05-15 22:03:47.000000000 +0200 @@ -56,6 +56,35 @@ /* --------------------------------------------------------------------- */ +// calculated using this formula from OpenMPT +// (i range 1-15, j range 0-15); +// unsigned int st2MixingRate = 23863; +// const unsigned char tempo_table[18] = {140, 50, 25, 15, 10, 7, 6, 4, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1}; +// long double samplesPerTick = (double) st2MixingRate / ((long double) 50 - ((tempo_table[high_nibble] * low_nibble) / 16)); +// st2MixingRate *= 5; // normally multiplied by the precision beyond the decimal point, however there's no decimal place here. :P +// st2MixingRate += samplesPerTick; +// st2MixingRate = (st2MixingRate >= 0) +// ? (int32_t) (st2MixingRate / (samplesPerTick * 2)) +// : (int32_t)((st2MixingRate - ((samplesPerTick * 2) - 1)) / (samplesPerTick * 2)); +static unsigned int tempo_table[15][16] = { + { 125, 117, 110, 102, 95, 87, 80, 72, 62, 55, 47, 40, 32, 25, 17, 10, }, + { 125, 122, 117, 115, 110, 107, 102, 100, 95, 90, 87, 82, 80, 75, 72, 67, }, + { 125, 125, 122, 120, 117, 115, 112, 110, 107, 105, 102, 100, 97, 95, 92, 90, }, + { 125, 125, 122, 122, 120, 117, 117, 115, 112, 112, 110, 110, 107, 105, 105, 102, }, + { 125, 125, 125, 122, 122, 120, 120, 117, 117, 117, 115, 115, 112, 112, 110, 110, }, + { 125, 125, 125, 122, 122, 122, 120, 120, 117, 117, 117, 115, 115, 115, 112, 112, }, + { 125, 125, 125, 125, 122, 122, 122, 122, 120, 120, 120, 120, 117, 117, 117, 117, }, + { 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 120, 120, 120, 120, 120, }, + { 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 120, 120, 120, 120, 120, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 122, 122, 122, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 122, 122, 122, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 122, 122, 122, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 122, 122, 122, 122, 122, 122, 122, 122, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, }, + { 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, }, +}; + + #pragma pack(push, 1) struct stm_sample { char name[12]; @@ -86,10 +115,28 @@ // KLMNO can be entered in the editor but don't do anything }; +static uint8_t handle_tempo(size_t tempo) +{ + size_t tpr = (tempo >> 4) ?: 1; + size_t scale = (tempo & 15); + + return tempo_table[tpr - 1][scale]; +} + /* ST2 says at startup: "Remark: the user ID is encoded in over ten places around the file!" I wonder if this is interesting at all. */ +static void handle_stm_tempo_pattern(song_note_t *note, size_t tempo) +{ + for (int i = 0; i < 5; i++, note++) { + if (note->effect == FX_NONE) { + note->effect = FX_TEMPO; + note->param = handle_tempo(tempo); + break; + } + } +} static void load_stm_pattern(song_note_t *note, slurp_t *fp) { @@ -97,43 +144,38 @@ uint8_t v[4]; for (row = 0; row < 64; row++, note += 64 - 4) { - for (chan = 0; chan < 4; chan++, note++) { + for (chan = 0; chan < 4; chan++) { + song_note_t* chan_note = note + chan; slurp_read(fp, v, 4); // mostly copied from modplug... if (v[0] < 251) - note->note = (v[0] >> 4) * 12 + (v[0] & 0xf) + 37; - note->instrument = v[1] >> 3; - if (note->instrument > 31) - note->instrument = 0; // oops never mind, that was crap - note->volparam = (v[1] & 0x7) + ((v[2] & 0xf0) >> 1); - if (note->volparam <= 64) - note->voleffect = VOLFX_VOLUME; + chan_note->note = (v[0] >> 4) * 12 + (v[0] & 0xf) + 37; + chan_note->instrument = v[1] >> 3; + if (chan_note->instrument > 31) + chan_note->instrument = 0; // oops never mind, that was crap + chan_note->volparam = (v[1] & 0x7) + ((v[2] & 0xf0) >> 1); + if (chan_note->volparam <= 64) + chan_note->voleffect = VOLFX_VOLUME; else - note->volparam = 0; - note->param = v[3]; // easy! + chan_note->volparam = 0; + chan_note->param = v[3]; // easy! - note->effect = stm_effects[v[2] & 0xf]; + chan_note->effect = stm_effects[v[2] & 0xf]; // patch a couple effects up - switch (note->effect) { + switch (chan_note->effect) { case FX_SPEED: - // I don't know how Axx really works, but I do know that this - // isn't it. It does all sorts of mindbogglingly screwy things: - // 01 - very fast, - // 0F - very slow. - // 10 - fast again! - // I don't get it. - note->param >>= 4; + /* do nothing; this is handled later */ break; case FX_VOLUMESLIDE: // Scream Tracker 2 checks for the lower nibble first for some reason... - if (note->param & 0x0f && note->param >> 4) - note->param &= 0x0f; - if (!note->param) - note->effect = FX_NONE; + if (chan_note->param & 0x0f && chan_note->param >> 4) + chan_note->param &= 0x0f; + if (!chan_note->param) + chan_note->effect = FX_NONE; break; case FX_PATTERNBREAK: - note->param = (note->param & 0xf0) * 10 + (note->param & 0xf); + chan_note->param = (chan_note->param & 0xf0) * 10 + (chan_note->param & 0xf); break; case FX_POSITIONJUMP: // This effect is also very weird. @@ -153,11 +195,22 @@ default: // Anything not listed above is a no-op if there's no value. // (ST2 doesn't have effect memory) - if (!note->param) - note->effect = FX_NONE; + if (!chan_note->param) + chan_note->effect = FX_NONE; break; } } + + for (chan = 0; chan < 4; chan++) { + song_note_t* chan_note = note + chan; + if (chan_note->effect == FX_SPEED) { + uint32_t tempo = chan_note->param; + chan_note->param >>= 4; + handle_stm_tempo_pattern(note, tempo); + } + } + + note += chan; } } @@ -200,7 +253,15 @@ song->title[20] = '\0'; slurp_seek(fp, 12, SEEK_CUR); // skip the tag and stuff - song->initial_speed = (slurp_getc(fp) >> 4) ?: 1; + size_t tempo = slurp_getc(fp); + + if (tmp[3] < 21) { + tempo = ((tempo / 10) << 4) + tempo % 10; + } + + song->initial_speed = (tempo >> 4) ?: 1; + song->initial_tempo = handle_tempo(tempo); + npat = slurp_getc(fp); song->initial_global_volume = 2 * slurp_getc(fp); slurp_seek(fp, 13, SEEK_CUR); // junk @@ -224,16 +285,18 @@ sample->c5speed = bswapLE16(stmsmp.c5speed); sample->volume = stmsmp.volume * 4; //mphack if (sample->loop_start < blen - && sample->loop_end != 0xffff - && sample->loop_start < sample->loop_end) { + && sample->loop_end != 0xffff + && sample->loop_start < sample->loop_end) { sample->flags |= CHN_LOOP; sample->loop_end = CLAMP(sample->loop_end, sample->loop_start, blen); } para_sdata[n] = bswapLE16(stmsmp.pcmpara); } - slurp_read(fp, song->orderlist, 128); - for (n = 0; n < 128; n++) { + size_t orderlist_size = tmp[3] ? 128 : 64; + + slurp_read(fp, song->orderlist, orderlist_size); + for (n = 0; n < orderlist_size; n++) { if (song->orderlist[n] >= 64) song->orderlist[n] = ORDER_LAST; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/fmt/xi.c new/schismtracker-20240515/fmt/xi.c --- old/schismtracker-20240503/fmt/xi.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/fmt/xi.c 2024-05-15 22:03:47.000000000 +0200 @@ -257,9 +257,16 @@ smp->panning = xmss.pan; smp->flags |= CHN_PANNING; smp->vib_type = xmsh.vibtype; - smp->vib_speed = xmsh.vibsweep; - smp->vib_depth = xmsh.vibdepth; - smp->vib_rate = xmsh.vibrate / 4; // XXX xm.c does not divide here, which is wrong? + smp->vib_speed = MIN(xmsh.vibrate, 64); + smp->vib_depth = MIN(xmsh.vibdepth, 32); + if (xmsh.vibrate | xmsh.vibdepth) { + if (xmsh.vibsweep) { + int s = _muldivr(smp->vib_depth, 256, xmsh.vibsweep); + smp->vib_rate = CLAMP(s, 0, 255); + } else { + smp->vib_rate = 255; + } + } smp->c5speed = transpose_to_frequency(xmss.relnote, xmss.finetune); sampledata += csf_read_sample(current_song->samples + n, rs, sampledata, (end-sampledata)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/fmt/xm.c new/schismtracker-20240515/fmt/xm.c --- old/schismtracker-20240503/fmt/xm.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/fmt/xm.c 2024-05-15 22:03:47.000000000 +0200 @@ -140,12 +140,21 @@ note->param = slurp_getc(fp); } // translate everything - if (note->note > 0 && note->note < 97) + if (note->note > 0 && note->note < 97) { note->note += 12; - else if (note->note == 97) + } else if (note->note == 97) { + /* filter out instruments on noteoff; + * this is what IT's importer does, because + * hanging the note is *definitely* not + * intended behavior + * + * see: MPT test case noteoff3.it */ note->note = NOTE_OFF; - else + note->instrument = 0; + } else { note->note = NOTE_NONE; + } + if (note->effect || note->param) csf_import_mod_effect(note, 1); if (note->instrument == 0xff) @@ -423,14 +432,14 @@ } enum { - ID_CONFIRMED = 1, // confirmed with inst/sample header sizes - ID_FT2GENERIC = 2, // "FastTracker v2.00", but fasttracker has NOT been ruled out - ID_OLDMODPLUG = 4, // "FastTracker v 2.00" - ID_OTHER = 8, // something we don't know, testing for digitrakker. - ID_FT2CLONE = 16, // NOT FT2: itype changed between instruments, or \0 found in song title - ID_MAYBEMODPLUG = 32, // some FT2-ish thing, possibly MPT. - ID_DIGITRAK = 64, // probably digitrakker - ID_UNKNOWN = 128 | ID_CONFIRMED, // ????? + ID_CONFIRMED = 0x01, // confirmed with inst/sample header sizes + ID_FT2GENERIC = 0x02, // "FastTracker v2.00", but fasttracker has NOT been ruled out + ID_OLDMODPLUG = 0x04, // "FastTracker v 2.00" + ID_OTHER = 0x08, // something we don't know, testing for digitrakker. + ID_FT2CLONE = 0x10, // NOT FT2: itype changed between instruments, or \0 found in song title + ID_MAYBEMODPLUG = 0x20, // some FT2-ish thing, possibly MPT. + ID_DIGITRAK = 0x40, // probably digitrakker + ID_UNKNOWN = 0x80 | ID_CONFIRMED, // ????? }; // TODO: try to identify packers (boobiesqueezer?) @@ -451,19 +460,15 @@ if (strncmp(song->tracker_id, "FastTracker ", 12) == 0) { if (hdr->headersz == 276 && strncmp(song->tracker_id + 12, "v2.00 ", 8) == 0) { - // TODO: is it at all possible to tell the precise FT2 version? that'd be a neat trick. - // (Answer: unlikely. After some testing, I can't identify any differences between 2.04 - // and 2.09. Doesn't mean for certain that they're identical, but I would be surprised - // if anything did change.) detected = ID_FT2GENERIC | ID_MAYBEMODPLUG; - // replace the "v2.00" with just a 2, since it's probably not actually v2.00 - strcpy(song->tracker_id + 12, "2"); + /* there is very little change between different versions of FT2, making it + * very difficult (maybe even impossible) to detect them, so here we just + * say it's either FT2 or a compatible tracker */ + strcpy(song->tracker_id + 12, "2 or compatible"); } else if (strncmp(song->tracker_id + 12, "v 2.00 ", 8) == 0) { - // Old MPT: - // - 1.00a5 (ihdr=245) - // - beta 3.3 (ihdr=263) - strcpy(song->tracker_id, "Modplug Tracker 1.0"); - detected = ID_OLDMODPLUG; + /* alpha and beta are handled later */ + detected = ID_OLDMODPLUG | ID_CONFIRMED; + strcpy(song->tracker_id, "ModPlug Tracker 1.0"); } else { // definitely NOT FastTracker, so let's clear up that misconception detected = ID_UNKNOWN; @@ -606,7 +611,19 @@ vtype = autovib_import[slurp_getc(fp) & 0x7]; vsweep = slurp_getc(fp); vdepth = slurp_getc(fp); - vrate = slurp_getc(fp) / 4; + vdepth = MIN(vdepth, 32); + vrate = slurp_getc(fp); + vrate = MIN(vrate, 64); + + /* translate the sweep value */ + if (vrate | vdepth) { + if (vsweep) { + int s = _muldivr(vdepth, 256, vsweep); + vsweep = CLAMP(s, 0, 255); + } else { + vsweep = 255; + } + } slurp_read(fp, &w, 2); ins->fadeout = bswapLE16(w); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/player/csndfile.c new/schismtracker-20240515/player/csndfile.c --- old/schismtracker-20240503/player/csndfile.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/player/csndfile.c 2024-05-15 22:03:47.000000000 +0200 @@ -1495,12 +1495,7 @@ case 'P': effect = FX_PANNINGSLIDE; break; case 'Q': effect = FX_RETRIG; break; case 'R': effect = FX_TREMOLO; break; - case 'S': - effect = FX_SPECIAL; - // convert old SAx to S8x - if (!from_it && ((param & 0xf0) == 0xa0)) - param = 0x80 | ((param & 0xf) ^ 8); - break; + case 'S': effect = FX_SPECIAL; break; case 'T': effect = FX_TEMPO; break; case 'U': effect = FX_FINEVIBRATO; break; case 'V': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/player/effects.c new/schismtracker-20240515/player/effects.c --- old/schismtracker-20240503/player/effects.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/player/effects.c 2024-05-15 22:03:47.000000000 +0200 @@ -1337,8 +1337,14 @@ return; } - if (psmp == chan->ptr_sample && chan->current_sample_data && chan->length) + const int was_key_off = (chan->flags & CHN_KEYOFF) != 0; + + if (psmp == chan->ptr_sample && chan->current_sample_data && chan->length) { + if (porta && inst_changed && penv) { + chan->flags &= ~(CHN_KEYOFF | CHN_NOTEFADE); + } return; + } if (porta && !chan->length) chan->increment = 0; @@ -1387,7 +1393,7 @@ chan->current_sample_data = psmp->data; chan->position = 0; - if (chan->flags & CHN_SUSTAINLOOP) { + if ((chan->flags & CHN_SUSTAINLOOP) && (!porta || (penv && !was_key_off))) { chan->loop_start = psmp->sustain_start; chan->loop_end = psmp->sustain_end; chan->flags |= CHN_LOOP; @@ -2144,6 +2150,22 @@ // set instrument before doing anything else if (instr && start_note) chan->new_instrument = instr; + // This is probably the single biggest WTF replayer bug in Impulse Tracker. + // In instrument mode, when an note + instrument is triggered that does not map to any sample, the entire cell (including potentially present global effects!) + // is ignored. Even better, if on a following row another instrument number (this time without a note) is encountered, we end up in the same situation! + if (instr > 0 && instr < MAX_INSTRUMENTS && csf->instruments[instr] != NULL) + { + uint8_t note = (chan->row_note != NOTE_NONE) ? chan->row_note : chan->new_note; + if (NOTE_IS_NOTE(note) && csf->instruments[instr]->sample_map[note - NOTE_FIRST] == 0) + { + chan->new_note = note; + chan->row_instr = 0; + chan->row_voleffect = VOLFX_NONE; + chan->row_effect = FX_NONE; + continue; + } + } + /* Have to handle SDx specially because of the way the effects are structured. In a PERFECT world, this would be very straightforward: - Handle the effect column, and set flags for things that should happen @@ -2242,6 +2264,7 @@ GM_Touch(nchan, 0); } + const int previous_new_note = chan->new_note; if (NOTE_IS_NOTE(note)) { chan->new_note = note; @@ -2280,7 +2303,11 @@ // New Note ? if (note != NOTE_NONE) { if (!instr && chan->new_instrument && NOTE_IS_NOTE(note)) { + if (NOTE_IS_NOTE(previous_new_note)) { + chan->new_note = previous_new_note; + } csf_instrument_change(csf, chan, chan->new_instrument, porta, 0); + chan->new_note = note; if ((csf->flags & SONG_INSTRUMENTMODE) && chan->new_instrument < MAX_INSTRUMENTS && csf->instruments[chan->new_instrument]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/schism/clippy.c new/schismtracker-20240515/schism/clippy.c --- old/schismtracker-20240503/schism/clippy.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/schism/clippy.c 2024-05-15 22:03:47.000000000 +0200 @@ -38,49 +38,21 @@ static void _clippy_copy_to_sys(int cb) { - char* freeme = NULL; - - if (_current_selection) { - char* dst = NULL; - int i = 0; -#ifdef WIN32 - /* need twice the space since newlines are replaced with \r\n */ - freeme = dst = malloc(strlen(_current_selection) * 2) + 1; -#else - /* XXX what's 4?? */ - freeme = dst = malloc(strlen(_current_selection) + 4); -#endif - if (!freeme) return; - for (i = 0; _current_selection[i]; i++) { -#ifdef WIN32 - if (_current_selection[i] == '\r' || _current_selection[i] == '\n') { - *(dst++) = '\r'; - *(dst++) = '\n'; - } else { - *(dst++) = _current_selection[i]; - } -#else - *(dst++) = (_current_selection[i] == '\r') ? '\n' : _current_selection[i]; -#endif - } - (*dst++) = '\0'; - } + if (!_current_selection) + return; switch (cb) { case CLIPPY_SELECT: /* TODO: convert to UTF-8 */ #if SDL_VERSION_ATLEAST(2, 26, 0) - SDL_SetPrimarySelectionText(freeme); -#endif + SDL_SetPrimarySelectionText(_current_selection); +#endif break; default: case CLIPPY_BUFFER: - SDL_SetClipboardText(freeme); + SDL_SetClipboardText(_current_selection); break; } - - if (freeme) - free(freeme); } static void _string_paste(UNUSED int cb, const char *cbptr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/schismtracker-20240503/schism/dmoz.c new/schismtracker-20240515/schism/dmoz.c --- old/schismtracker-20240503/schism/dmoz.c 2024-05-04 01:36:12.000000000 +0200 +++ new/schismtracker-20240515/schism/dmoz.c 2024-05-15 22:03:47.000000000 +0200 @@ -799,7 +799,7 @@ st.st_mtime = MIN(0, st.st_mtime); if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - dmoz_add_dir(dlist, fullpath, filename, 0); + dmoz_add_file_or_dir(flist, dlist, fullpath, filename, &st, 0); } else if (ffd.dwFileAttributes == INVALID_FILE_ATTRIBUTES) { free(fullpath); free(filename);

1 0

commit kiwi-images-wsl for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kiwi-images-wsl for openSUSE:Factory checked in at 2024-05-16 17:16:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-images-wsl (Old) and /work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-images-wsl" Thu May 16 17:16:06 2024 rev:14 rq:1174377 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-images-wsl/kiwi-images-wsl.changes 2024-04-25 20:48:57.233576859 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.1880/kiwi-images-wsl.changes 2024-05-16 17:18:22.626884939 +0200 @@ -1,0 +2,5 @@ +Wed May 15 07:23:59 UTC 2024 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Add explicit mention of procps to the package list (boo#1224253). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-images-wsl.kiwi ++++++ --- /var/tmp/diff_new_pack.rNCOAe/_old 2024-05-16 17:18:23.090901757 +0200 +++ /var/tmp/diff_new_pack.rNCOAe/_new 2024-05-16 17:18:23.094901902 +0200 @@ -27,22 +27,23 @@  <package name="system-user-nobody"/>  + <package name="aaa_base-extras"/> + <package name="aaa_base-wsl"/> + <package name="bzip2"/> + <package name="dos2unix"/> <package name="iputils"/> - <package name="openssh"/> - <package name="wget"/> - <package name="screen"/> <package name="less"/> + <package name="libyui-ncurses-pkg"/> <package name="lsof"/> <package name="man"/> - <package name="zip"/> - <package name="bzip2"/> - <package name="dos2unix"/> - <package name="libyui-ncurses-pkg"/> - <package name="yast2-packager"/> + <package name="openssh"/> + <package name="procps"/> + <package name="screen"/> + <package name="wget"/> <package name="yast2-firstboot"/> <package name="yast2-firstboot-wsl"/> - <package name="aaa_base-extras"/> - <package name="aaa_base-wsl"/> + <package name="yast2-packager"/> + <package name="zip"/>  <package name="timezone"/>

1 0

commit kvantum for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kvantum for openSUSE:Factory checked in at 2024-05-16 17:16:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvantum (Old) and /work/SRC/openSUSE:Factory/.kvantum.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvantum" Thu May 16 17:16:04 2024 rev:20 rq:1174374 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kvantum/kvantum.changes 2024-03-19 17:32:22.131927818 +0100 +++ /work/SRC/openSUSE:Factory/.kvantum.new.1880/kvantum.changes 2024-05-16 17:18:21.066828397 +0200 @@ -1,0 +2,11 @@ +Thu May 16 06:02:54 UTC 2024 - Konstantin Voinov <kv(a)kott.no-ip.biz> + +- Version 1.1.1 + * A workaround is added for a backward incompatible change in how + Qt 6.7 draws item views. + * Fixed an old issue in drawing radio buttons under mouse cursor + without animation. + * The support for qmake is back but without KWindowSystem (and + without being advertised). + +------------------------------------------------------------------- Old: ---- kvantum-1.1.0.tar.gz New: ---- kvantum-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvantum.spec ++++++ --- /var/tmp/diff_new_pack.n3dhNP/_old 2024-05-16 17:18:22.126866816 +0200 +++ /var/tmp/diff_new_pack.n3dhNP/_new 2024-05-16 17:18:22.130866962 +0200 @@ -31,7 +31,7 @@ %define dsc_suffix Qt5 %endif Name: kvantum%{?pkg_suffix} -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: SVG-based theme engine for Qt5 and Qt6 License: GPL-3.0-or-later ++++++ kvantum-1.1.0.tar.gz -> kvantum-1.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/ChangeLog new/Kvantum-1.1.1/Kvantum/ChangeLog --- old/Kvantum-1.1.0/Kvantum/ChangeLog 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/ChangeLog 2024-04-18 21:21:32.000000000 +0200 @@ -1,3 +1,9 @@ +V1.1.1 +--------- + * The support for qmake is back without KWindowSystem and without being advertised. + * Added a workaround for a backward incompatible change in how Qt 6.7 draws item views. + * Fixed an old issue in drawing radio buttons under mouse cursor without animation. + V1.1.0 --------- * Made the default compilation be against Qt6. (For Qt5, set "ENABLE_QT5" to "ON", as in `cmake .. -DENABLE_QT5=ON`.) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/NEWS new/Kvantum-1.1.1/Kvantum/NEWS --- old/Kvantum-1.1.0/Kvantum/NEWS 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/NEWS 2024-04-18 21:21:32.000000000 +0200 @@ -1,5 +1,5 @@ Latest version: - 17 Mar 2024, V1.1.0 + 18 Apr 2024, V1.1.1 See "ChangeLog" for changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantum.pro new/Kvantum-1.1.1/Kvantum/kvantum.pro --- old/Kvantum-1.1.0/Kvantum/kvantum.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantum.pro 2024-04-18 21:21:32.000000000 +0200 @@ -0,0 +1,12 @@ +SUBDIRS += style + +equals(QT_MAJOR_VERSION, 6) { + SUBDIRS += kvantumpreview \ + kvantummanager \ + themes +} + +TEMPLATE = subdirs + +CONFIG += qt \ + warn_on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantummanager/about.ui new/Kvantum-1.1.1/Kvantum/kvantummanager/about.ui --- old/Kvantum-1.1.0/Kvantum/kvantummanager/about.ui 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantummanager/about.ui 2024-04-18 21:21:32.000000000 +0200 @@ -125,7 +125,7 @@ Greek: Dimitrios Glentadakis <a href="https://github.com/dglent"><span;>(dglent at GitHub)</a> -Hebrew: itay alush <a href="https://github.com/itayalush1">(itayalush1 at GitHub)</a>, Omer I.S. <a href="https://github.com/omeritzics">(omeritzics at GitHub)</a> +Hebrew: itay alush <a href="https://github.com/itayalush1">(itayalush1 at GitHub)</a>, Omer I.S. <a href="https://github.com/omeritzics">(omeritzics at GitHub)</a>, Yaron Shahrabani <a href="https://github.com/yarons">(yarons at GitHub)</a> Hungarian: <a href="https://github.com/zoli111">zoli111 at GitHub</a>, Ács Zoltán diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantummanager/data/translations/kvantummanager_he.ts new/Kvantum-1.1.1/Kvantum/kvantummanager/data/translations/kvantummanager_he.ts --- old/Kvantum-1.1.0/Kvantum/kvantummanager/data/translations/kvantummanager_he.ts 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantummanager/data/translations/kvantummanager_he.ts 2024-04-18 21:21:32.000000000 +0200 @@ -479,12 +479,12 @@ <message> <location filename="../../kvantummanager.ui" line="821"/> <source>Menu:</source> - <translation type="unfinished"></translation> + <translation>תפריט:</translation> </message> <message> <location filename="../../kvantummanager.ui" line="828"/> <source>Tooltip:</source> - <translation type="unfinished"></translation> + <translation>חלונית צצה:</translation> </message> <message> <location filename="../../kvantummanager.ui" line="852"/> @@ -517,7 +517,7 @@ <message> <location filename="../../kvantummanager.ui" line="955"/> <source>Blurring for menus and tooltips</source> - <translation type="unfinished"></translation> + <translation>טשטוש לתפריטים וחלוניות צצות</translation> </message> <message> <location filename="../../kvantummanager.ui" line="962"/> @@ -535,7 +535,7 @@ <message> <location filename="../../kvantummanager.ui" line="979"/> <source>Translucent windows</source> - <translation type="unfinished"></translation> + <translation>חלונות שקופים למחצה</translation> </message> <message> <location filename="../../kvantummanager.ui" line="1053"/> @@ -1606,7 +1606,7 @@ <message> <location filename="../../KvantumManager.cpp" line="2816"/> <source>Restored the root default settings of %1</source> - <translation type="unfinished"></translation> + <translation>שוחזרו הגדרות ברירת המחדל המקוריות של %1</translation> </message> <message> <location filename="../../KvantumManager.cpp" line="2817"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantummanager/kvantummanager.pro new/Kvantum-1.1.1/Kvantum/kvantummanager/kvantummanager.pro --- old/Kvantum-1.1.0/Kvantum/kvantummanager/kvantummanager.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantummanager/kvantummanager.pro 2024-04-18 21:21:32.000000000 +0200 @@ -0,0 +1,74 @@ +lessThan(QT_MAJOR_VERSION, 5) { + error("Kvantum Manager needs at least Qt 5.15.0.") +} else { + lessThan(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 15) { + error("Kvantum Manager needs at least Qt 5.15.0.") + } + } else { + equals(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 2) { + error("Kvantum needs at least Qt 6.2.0.") + } + } else { + error("Kvantum cannot be compiled against this version of Qt.") + } + } +} + +QT += core gui widgets \ + svg + +TARGET = kvantummanager +TEMPLATE = app +CONFIG += c++11 + +SOURCES += main.cpp \ + KvantumManager.cpp \ + KvCommand.cpp \ + svgicons.cpp + +RESOURCES += kvantummanager.qrc + +HEADERS += KvantumManager.h \ + combobox.h \ + KvCommand.h \ + svgicons.h + +FORMS += \ + kvantummanager.ui \ + about.ui + +unix { + #TRANSLATIONS + exists($$[QT_INSTALL_BINS]/lrelease) { + TRANSLATIONS = $$system("find data/translations/ -name 'kvantummanager_*.ts'") + updateqm.input = TRANSLATIONS + updateqm.output = data/translations/translations/${QMAKE_FILE_BASE}.qm + updateqm.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN} -qm data/translations/translations/${QMAKE_FILE_BASE}.qm + updateqm.CONFIG += no_link target_predeps + QMAKE_EXTRA_COMPILERS += updateqm + } + + #VARIABLES + isEmpty(PREFIX) { + PREFIX = /usr + } + BINDIR = $$PREFIX/bin + DATADIR =$$PREFIX/share + + DEFINES += DATADIR=\\\"$$DATADIR\\\" + + #MAKE INSTALL + iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps + iconsvg.files += ../kvantumpreview/data/kvantum.svg + + desktop.path = $$DATADIR/applications + desktop.files += ./data/$${TARGET}.desktop + + trans.path = $$DATADIR/kvantummanager + trans.files += ./data/translations/translations + + target.path =$$BINDIR + INSTALLS += target desktop iconsvg trans +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantummanager/main.cpp new/Kvantum-1.1.1/Kvantum/kvantummanager/main.cpp --- old/Kvantum-1.1.0/Kvantum/kvantummanager/main.cpp 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantummanager/main.cpp 2024-04-18 21:21:32.000000000 +0200 @@ -27,7 +27,7 @@ int main (int argc, char *argv[]) { const QString name = "Kvantum Manager"; - const QString version = "1.1.0"; + const QString version = "1.1.1"; QStringList options; for (int i = 1; i < argc; ++i) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantumpreview/data/translations/kvantumpreview_de.ts new/Kvantum-1.1.1/Kvantum/kvantumpreview/data/translations/kvantumpreview_de.ts --- old/Kvantum-1.1.0/Kvantum/kvantumpreview/data/translations/kvantumpreview_de.ts 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantumpreview/data/translations/kvantumpreview_de.ts 2024-04-18 21:21:32.000000000 +0200 @@ -151,7 +151,7 @@ <message> <location filename="../../KvantumPreviewBase.ui" line="366"/> <source>Push button with menu</source> - <translation type="unfinished"></translation> + <translation>Druckknopf mit Menü</translation> </message> <message> <location filename="../../KvantumPreviewBase.ui" line="415"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/kvantumpreview/kvantumpreview.pro new/Kvantum-1.1.1/Kvantum/kvantumpreview/kvantumpreview.pro --- old/Kvantum-1.1.0/Kvantum/kvantumpreview/kvantumpreview.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/kvantumpreview/kvantumpreview.pro 2024-04-18 21:21:32.000000000 +0200 @@ -0,0 +1,55 @@ +lessThan(QT_MAJOR_VERSION, 5) { + error("Kvantum Preview needs at least Qt 5.15.0.") +} else { + lessThan(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 15) { + error("Kvantum Preview needs at least Qt 5.15.0.") + } + } else { + equals(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 2) { + error("Kvantum needs at least Qt 6.2.0.") + } + } else { + error("Kvantum cannot be compiled against this version of Qt.") + } + } +} + +TEMPLATE = app +TARGET = kvantumpreview +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += KvantumPreview.h +FORMS += KvantumPreviewBase.ui +SOURCES += main.cpp +RESOURCES += KvantumPreviewResources.qrc +QT += widgets +unix { + #TRANSLATIONS + exists($$[QT_INSTALL_BINS]/lrelease) { + TRANSLATIONS = $$system("find data/translations/ -name 'kvantumpreview_*.ts'") + updateqm.input = TRANSLATIONS + updateqm.output = data/translations/translations/${QMAKE_FILE_BASE}.qm + updateqm.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN} -qm data/translations/translations/${QMAKE_FILE_BASE}.qm + updateqm.CONFIG += no_link target_predeps + QMAKE_EXTRA_COMPILERS += updateqm + } + + #VARIABLES + isEmpty(PREFIX) { + PREFIX = /usr + } + BINDIR = $$PREFIX/bin + DATADIR =$$PREFIX/share + + DEFINES += DATADIR=\\\"$$DATADIR\\\" + + trans.path = $$DATADIR/kvantumpreview + trans.files += ./data/translations/translations + + target.path =$$BINDIR + INSTALLS += target trans +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/style/Kvantum.cpp new/Kvantum-1.1.1/Kvantum/style/Kvantum.cpp --- old/Kvantum-1.1.0/Kvantum/style/Kvantum.cpp 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/style/Kvantum.cpp 2024-04-18 21:21:32.000000000 +0200 @@ -2744,11 +2744,15 @@ else suffix = "-normal"; } - bool animate(opacityTimer_ && !qstyleoption_cast<const QStyleOptionMenuItem*>(option)); - if (!animate && widget != nullptr // not QML or Libreoffice's unstyled menu - && elementExists("menu-"+ispec.element+suffix)) + bool animate(opacityTimer_); + if (qstyleoption_cast<const QStyleOptionMenuItem*>(option)) { - prefix = "menu-"; // make exception for menuitems + animate = false; // no animation for menuitems + if (widget != nullptr // not QML or Libreoffice's unstyled menu + && elementExists("menu-"+ispec.element+suffix)) + { + prefix = "menu-"; // make exception for menuitems + } } if (isWidgetInactive(widget)) suffix.append("-inactive"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/style/style.pro new/Kvantum-1.1.1/Kvantum/style/style.pro --- old/Kvantum-1.1.0/Kvantum/style/style.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/style/style.pro 2024-04-18 21:21:32.000000000 +0200 @@ -0,0 +1,106 @@ +CONFIG += qt \ + plugin \ + x11 \ + warn_on + +QT += svg + +greaterThan(QT_MAJOR_VERSION, 4) { + lessThan(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 15) { + error("Kvantum needs at least Qt 5.15.0.") + } + QT += x11extras + } else { + equals(QT_MAJOR_VERSION, 6) { + lessThan(QT_MINOR_VERSION, 2) { + error("Kvantum needs at least Qt 6.2.0.") + } else { + QT += widgets + } + } else { + error("Kvantum cannot be compiled against this version of Qt.") + } + } +} + +TARGET = kvantum +TEMPLATE = lib +CONFIG += c++11 + +VERSION = 0.1 + +greaterThan(QT_MAJOR_VERSION, 4) { + DEFINES += NO_KF + message("Compiling without KDE Frameworks...") + + SOURCES += Kvantum.cpp \ + eventFiltering.cpp \ + polishing.cpp \ + rendering.cpp \ + standardIcons.cpp \ + viewItems.cpp \ + KvantumPlugin.cpp \ + shortcuthandler.cpp \ + drag/windowmanager.cpp \ + blur/blurhelper.cpp \ + animation/animation.cpp \ + themeconfig/ThemeConfig.cpp + HEADERS += Kvantum.h \ + KvantumPlugin.h \ + shortcuthandler.h \ + drag/windowmanager.h \ + blur/blurhelper.h \ + animation/animation.h \ + themeconfig/ThemeConfig.h \ + themeconfig/specs.h + OTHER_FILES += kvantum.json +} else { + SOURCES += qt4/Kvantum4.cpp \ + qt4/KvantumPlugin4.cpp \ + qt4/shortcuthandler4.cpp \ + qt4/x11wmmove4.cpp \ + qt4/windowmanager4.cpp \ + qt4/blurhelper4.cpp \ + qt4/ThemeConfig4.cpp + HEADERS += qt4/Kvantum4.h \ + qt4/KvantumPlugin4.h \ + qt4/shortcuthandler4.h \ + qt4/x11wmmove4.h \ + qt4/windowmanager4.h \ + qt4/blurhelper4.h \ + qt4/ThemeConfig4.h \ + qt4/specs4.h +} + +RESOURCES += themeconfig/defaulttheme.qrc + +unix:!macx: LIBS += -lX11 + +unix { + #VARIABLES + isEmpty(PREFIX) { + PREFIX = /usr + } + COLORSDIR =$$PREFIX/share/kde4/apps/color-schemes + KFCOLORSDIR =$$PREFIX/share/color-schemes + DATADIR =$$PREFIX/share + + DEFINES += DATADIR=\\\"$$DATADIR\\\" + + #MAKE INSTALL + target.path = $$[QT_INSTALL_PLUGINS]/styles + colors.path = $$COLORSDIR + colors.files += ../color/Kvantum.colors + kfcolors.path = $$KFCOLORSDIR + kfcolors.files += ../color/Kvantum.colors + lessThan(QT_MAJOR_VERSION, 5) { + INSTALLS += target colors + } else { + lessThan(QT_MAJOR_VERSION, 6) { + INSTALLS += target + } else { + INSTALLS += target kfcolors + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/style/viewItems.cpp new/Kvantum-1.1.1/Kvantum/style/viewItems.cpp --- old/Kvantum-1.1.0/Kvantum/style/viewItems.cpp 2024-03-17 05:18:34.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/style/viewItems.cpp 2024-04-18 21:21:32.000000000 +0200 @@ -1,7 +1,7 @@ // Adapted from Qt -> "qcommonstyle.cpp" to control how view-items are drawn. /* - * Copyright (C) Pedram Pourang (aka Tsu Jan) 2021 <tsujan2000(a)gmail.com> + * Copyright (C) Pedram Pourang (aka Tsu Jan) 2021-2024 <tsujan2000(a)gmail.com> * * Kvantum is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -592,7 +592,12 @@ checkRect->size(), check); *pixmapRect = QStyle::alignedRect(opt->direction, opt->decorationAlignment, pixmapRect->size(), decoration); +#if (QT_VERSION >= QT_VERSION_CHECK(6,7,0)) + if (opt->showDecorationSelected + || emptyText) // WARNING: There is a backward incompatible change in Qt 6.7. +#else if (opt->showDecorationSelected) +#endif *textRect = display; // the text takes all available space else *textRect = QStyle::alignedRect(opt->direction, opt->displayAlignment, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Kvantum-1.1.0/Kvantum/themes/themes.pro new/Kvantum-1.1.1/Kvantum/themes/themes.pro --- old/Kvantum-1.1.0/Kvantum/themes/themes.pro 1970-01-01 01:00:00.000000000 +0100 +++ new/Kvantum-1.1.1/Kvantum/themes/themes.pro 2024-04-18 21:21:32.000000000 +0200 @@ -0,0 +1,18 @@ +TEMPLATE = aux + +unix { + #VARIABLES + isEmpty(PREFIX) { + PREFIX = /usr + } + KVDIR = $$PREFIX/share/Kvantum + KFCOLORSDIR = $$PREFIX/share/color-schemes + + #MAKE INSTALL + QMAKE_INSTALL_DIR = cp -f -R --no-preserve=mode + kv.path = $$KVDIR + kv.files += ./kvthemes/* + kfcolors.path = $$KFCOLORSDIR + kfcolors.files += ./colors/*.colors + INSTALLS += kv kfcolors +}

1 0

commit languagetool for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package languagetool for openSUSE:Factory checked in at 2024-05-16 17:16:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/languagetool (Old) and /work/SRC/openSUSE:Factory/.languagetool.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "languagetool" Thu May 16 17:16:00 2024 rev:7 rq:1174353 version:4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/languagetool/languagetool-core.changes 2024-02-22 20:58:54.868037698 +0100 +++ /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-core.changes 2024-05-16 17:18:18.138722271 +0200 @@ -1,0 +2,7 @@ +Sat May 4 14:01:48 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- languagetool-test-resource.patch + * fix running tests from the standalone + languagetool-core-tests.jar + +------------------------------------------------------------------- languagetool-tools.changes: same change languagetool.changes: same change New: ---- languagetool-test-resource.patch BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-core.changes- /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-core.changes:- languagetool-test-resource.patch /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-core.changes- * fix running tests from the standalone -- /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-tools.changes- /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-tools.changes:- languagetool-test-resource.patch /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool-tools.changes- * fix running tests from the standalone -- /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool.changes- /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool.changes:- languagetool-test-resource.patch /work/SRC/openSUSE:Factory/.languagetool.new.1880/languagetool.changes- * fix running tests from the standalone BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ languagetool-core.spec ++++++ --- /var/tmp/diff_new_pack.mFTIRM/_old 2024-05-16 17:18:19.154759096 +0200 +++ /var/tmp/diff_new_pack.mFTIRM/_new 2024-05-16 17:18:19.154759096 +0200 @@ -32,6 +32,7 @@ Patch1: languagetool-xgboost-predictor.patch Patch2: languagetool-hunspell.patch Patch3: languagetool-4.8-lucene-8.patch +Patch4: languagetool-test-resource.patch BuildRequires: fdupes BuildRequires: hunspell-devel BuildRequires: maven-local @@ -95,6 +96,7 @@ %if %{?pkg_vcmp:%pkg_vcmp lucene-core >= 8}%{!?pkg_vcmp:0} %patch -P 3 -p1 %endif +%patch -P 4 -p1 cat %{SOURCE100} | sed "s#@LIBHUNSPELL@#$(basename $(readlink -e %{_libdir}/libhunspell.so))#g" | patch -p1 ++++++ languagetool-tools.spec ++++++ --- /var/tmp/diff_new_pack.mFTIRM/_old 2024-05-16 17:18:19.186760256 +0200 +++ /var/tmp/diff_new_pack.mFTIRM/_new 2024-05-16 17:18:19.190760401 +0200 @@ -29,6 +29,7 @@ Patch1: languagetool-xgboost-predictor.patch Patch2: languagetool-hunspell.patch Patch3: languagetool-4.8-lucene-8.patch +Patch4: languagetool-test-resource.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) @@ -56,6 +57,7 @@ %if %{?pkg_vcmp:%pkg_vcmp lucene-core >= 8}%{!?pkg_vcmp:0} %patch -P 3 -p1 %endif +%patch -P 4 -p1 pushd %{name} %{mvn_file} :{*} %{base_name}/@1 ++++++ languagetool.spec ++++++ --- /var/tmp/diff_new_pack.mFTIRM/_old 2024-05-16 17:18:19.218761416 +0200 +++ /var/tmp/diff_new_pack.mFTIRM/_new 2024-05-16 17:18:19.218761416 +0200 @@ -28,6 +28,7 @@ Patch1: languagetool-xgboost-predictor.patch Patch2: languagetool-hunspell.patch Patch3: languagetool-4.8-lucene-8.patch +Patch4: languagetool-test-resource.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: xmvn-subst @@ -163,6 +164,7 @@ %if %{?pkg_vcmp:%pkg_vcmp lucene-core >= 8}%{!?pkg_vcmp:0} %patch -P 3 -p1 %endif +%patch -P 4 -p1 # We built these ones in another spec file %pom_disable_module languagetool-core ++++++ languagetool-test-resource.patch ++++++ --- languagetool-4.8/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java 2024-05-04 15:45:27.936860841 +0200 +++ languagetool-4.8/languagetool-core/src/test/java/org/languagetool/tools/StringToolsTest.java 2024-05-04 15:46:39.262077132 +0200 @@ -55,7 +55,7 @@ @Test public void testReadStream() throws IOException { - String content = StringTools.readStream(new FileInputStream("src/test/resources/testinput.txt"), "utf-8"); + String content = StringTools.readStream(this.getClass().getResourceAsStream("/testinput.txt"), "utf-8"); assertEquals("one\ntwo\nöäüß\nșțîâăȘȚÎÂĂ\n", content); }

1 0

commit modello for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2024-05-16 17:15:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "modello" Thu May 16 17:15:57 2024 rev:17 rq:1174351 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2024-05-05 12:10:55.920194548 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.1880/modello-maven-plugin.changes 2024-05-16 17:18:13.174542351 +0200 @@ -1,0 +2,5 @@ +Thu May 16 05:23:46 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Package both relevant licenses + +------------------------------------------------------------------- modello.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.d2tJEe/_old 2024-05-16 17:18:13.970571202 +0200 +++ /var/tmp/diff_new_pack.d2tJEe/_new 2024-05-16 17:18:13.974571347 +0200 @@ -86,7 +86,7 @@ %patch -P 0 -p1 %patch -P 1 -p1 %patch -P 2 -p1 -cp -p %{SOURCE1} LICENSE +cp -p %{SOURCE1} . %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -114,8 +114,8 @@ %fdupes -s %{buildroot}%{_javadocdir} %files -f %{name}/.mfiles -%license LICENSE +%license LICENSE.txt LICENSE-2.0.txt %files javadoc -f %{name}/.mfiles-javadoc -%license LICENSE +%license LICENSE.txt LICENSE-2.0.txt ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.d2tJEe/_old 2024-05-16 17:18:13.998572217 +0200 +++ /var/tmp/diff_new_pack.d2tJEe/_new 2024-05-16 17:18:13.998572217 +0200 @@ -99,7 +99,7 @@ %patch -P 0 -p1 %patch -P 1 -p1 %patch -P 2 -p1 -cp -p %{SOURCE1} LICENSE +cp -p %{SOURCE1} . %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -166,13 +166,13 @@ %jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true %files -f .mfiles -f .mfiles-core -%license LICENSE +%license LICENSE.txt LICENSE-2.0.txt %{_bindir}/* %files test -f .mfiles-test -%license LICENSE +%license LICENSE.txt LICENSE-2.0.txt %files javadoc -%license LICENSE +%license LICENSE.txt LICENSE-2.0.txt %{_javadocdir}/%{name}

1 0

commit tycho for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tycho for openSUSE:Factory checked in at 2024-05-16 17:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tycho (Old) and /work/SRC/openSUSE:Factory/.tycho.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tycho" Thu May 16 17:15:56 2024 rev:20 rq:1174350 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tycho/tycho.changes 2024-04-17 16:24:50.269638320 +0200 +++ /work/SRC/openSUSE:Factory/.tycho.new.1880/tycho.changes 2024-05-16 17:18:11.406478270 +0200 @@ -1,0 +2,7 @@ +Wed May 15 16:39:13 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Added patch: + * tycho-mpp-311.patch + + fix build with maven-plugin-plugin >= 3.11 + +------------------------------------------------------------------- New: ---- tycho-mpp-311.patch BETA DEBUG BEGIN: New:- Added patch: * tycho-mpp-311.patch + fix build with maven-plugin-plugin >= 3.11 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tycho.spec ++++++ --- /var/tmp/diff_new_pack.ZcOzuZ/_old 2024-05-16 17:18:12.802528868 +0200 +++ /var/tmp/diff_new_pack.ZcOzuZ/_new 2024-05-16 17:18:12.806529013 +0200 @@ -70,6 +70,7 @@ Patch11: tycho-getTimestamp.patch Patch12: tycho-surefire.patch Patch13: tycho-surefire3.patch +Patch14: tycho-mpp-311.patch Patch100: fedoraproject-p2-bootstrap-fix.patch BuildRequires: bash BuildRequires: fdupes @@ -223,6 +224,7 @@ %patch -P 11 -p1 %patch -P 12 -p1 %patch -P 13 -p1 +%patch -P 14 -p1 %patch -P 100 # Unneeded for RPM builds ++++++ tycho-mpp-311.patch ++++++ --- tycho-1.6.0/target-platform-configuration/pom.xml 2024-05-15 14:36:53.368098051 +0200 +++ tycho-1.6.0/target-platform-configuration/pom.xml 2024-05-15 15:10:03.548000115 +0200 @@ -50,4 +50,18 @@ <version>${project.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>target-platform-configuration</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> + </project> --- tycho-1.6.0/tycho-compiler-plugin/pom.xml 2024-05-15 14:36:53.371431408 +0200 +++ tycho-1.6.0/tycho-compiler-plugin/pom.xml 2024-05-15 14:52:36.587501116 +0200 @@ -81,4 +81,16 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-compiler</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> </project> --- tycho-1.6.0/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml 2024-05-15 14:36:53.404764973 +0200 +++ tycho-1.6.0/tycho-extras/pack200/tycho-pack200a-plugin/pom.xml 2024-05-15 18:14:59.261868858 +0200 @@ -34,4 +34,18 @@ <version>${project.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-pack200a</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file --- tycho-1.6.0/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml 2024-05-15 18:28:21.073980942 +0200 +++ tycho-1.6.0/tycho-extras/pack200/tycho-pack200b-plugin/pom.xml 2024-05-15 18:26:31.363232566 +0200 @@ -39,4 +39,18 @@ <version>${project.version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-pack200b</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> + </project> --- tycho-1.6.0/tycho-extras/target-platform-validation-plugin/pom.xml 2024-05-15 14:36:53.408098330 +0200 +++ tycho-1.6.0/tycho-extras/target-platform-validation-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -34,6 +34,19 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>target-platform-validation</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>its</id> --- tycho-1.6.0/tycho-extras/tycho-custom-bundle-plugin/pom.xml 2024-05-15 14:36:53.408098330 +0200 +++ tycho-1.6.0/tycho-extras/tycho-custom-bundle-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -61,6 +61,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-custom-bundle</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-extras/tycho-dependency-tools-plugin/pom.xml 2024-05-15 14:36:53.411431686 +0200 +++ tycho-1.6.0/tycho-extras/tycho-dependency-tools-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -63,6 +63,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-dependency-tools</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-extras/tycho-document-bundle-plugin/pom.xml 2024-05-15 14:36:53.411431686 +0200 +++ tycho-1.6.0/tycho-extras/tycho-document-bundle-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -70,6 +70,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-document-bundle</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-extras/tycho-eclipserun-plugin/pom.xml 2024-05-15 14:36:53.414765043 +0200 +++ tycho-1.6.0/tycho-extras/tycho-eclipserun-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -65,4 +65,17 @@ </build> </profile> </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-eclipserun</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> </project> --- tycho-1.6.0/tycho-extras/tycho-p2-extras-plugin/pom.xml 2024-05-15 14:36:53.418098399 +0200 +++ tycho-1.6.0/tycho-extras/tycho-p2-extras-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -147,6 +147,14 @@ </filesets> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-p2-extras</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-extras/tycho-source-feature-plugin/pom.xml 2024-05-15 14:36:53.428098469 +0200 +++ tycho-1.6.0/tycho-extras/tycho-source-feature-plugin/pom.xml 2024-05-15 18:03:12.193732390 +0200 @@ -64,6 +64,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-source-feature</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-extras/tycho-version-bump-plugin/pom.xml 2024-05-15 14:36:53.431431826 +0200 +++ tycho-1.6.0/tycho-extras/tycho-version-bump-plugin/pom.xml 2024-05-15 14:38:04.951929674 +0200 @@ -40,6 +40,19 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-version-bump</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>its</id> --- tycho-1.6.0/tycho-p2/tycho-p2-director-plugin/pom.xml 2024-05-15 14:36:53.518099095 +0200 +++ tycho-1.6.0/tycho-p2/tycho-p2-director-plugin/pom.xml 2024-05-15 15:37:12.049317436 +0200 @@ -92,6 +92,18 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-p2-director</goalPrefix> + </configuration> + </plugin> </plugins> </build> </project> --- tycho-1.6.0/tycho-p2/tycho-p2-plugin/pom.xml 2024-05-15 14:36:53.521432452 +0200 +++ tycho-1.6.0/tycho-p2/tycho-p2-plugin/pom.xml 2024-05-15 15:28:50.812488466 +0200 @@ -67,6 +67,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-p2</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2024-05-15 14:36:53.521432452 +0200 +++ tycho-1.6.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2024-05-15 15:31:22.453546150 +0200 @@ -65,4 +65,20 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-p2-publisher</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> </project> --- tycho-1.6.0/tycho-p2/tycho-p2-repository-plugin/pom.xml 2024-05-15 14:36:53.524765809 +0200 +++ tycho-1.6.0/tycho-p2/tycho-p2-repository-plugin/pom.xml 2024-05-15 15:31:44.727034811 +0200 @@ -42,4 +42,20 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-p2-repository</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> </project> --- tycho-1.6.0/tycho-packaging-plugin/pom.xml 2024-05-15 14:36:53.524765809 +0200 +++ tycho-1.6.0/tycho-packaging-plugin/pom.xml 2024-05-15 14:38:16.382009244 +0200 @@ -86,6 +86,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-packaging</goalPrefix> + </configuration> + </plugin> </plugins> </build> </project> --- tycho-1.6.0/tycho-pomgenerator-plugin/pom.xml 2024-05-15 14:36:53.531432522 +0200 +++ tycho-1.6.0/tycho-pomgenerator-plugin/pom.xml 2024-05-15 15:45:25.876094536 +0200 @@ -62,4 +62,16 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-pomgenerator</goalPrefix> + </configuration> + </plugin> + </plugins> + </build> </project> --- tycho-1.6.0/tycho-release/tycho-versions-plugin/pom.xml 2024-05-15 14:36:53.534765878 +0200 +++ tycho-1.6.0/tycho-release/tycho-versions-plugin/pom.xml 2024-05-15 15:51:56.869138499 +0200 @@ -66,6 +66,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-versions</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-source-plugin/pom.xml 2024-05-15 14:36:53.548099304 +0200 +++ tycho-1.6.0/tycho-source-plugin/pom.xml 2024-05-15 14:38:17.828685979 +0200 @@ -93,6 +93,14 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-source</goalPrefix> + </configuration> + </plugin> </plugins> </build> --- tycho-1.6.0/tycho-surefire/tycho-surefire-plugin/pom.xml 2024-05-15 14:36:53.551432661 +0200 +++ tycho-1.6.0/tycho-surefire/tycho-surefire-plugin/pom.xml 2024-05-15 14:38:17.828685979 +0200 @@ -39,6 +39,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> +  + <configuration> + <goalPrefix>tycho-surefire</goalPrefix> + </configuration> + </plugin> </plugins> </build>

1 0

commit maven-shared-io for openSUSE:Factory
by Source-Sync 16 May '24

16 May '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-shared-io for openSUSE:Factory checked in at 2024-05-16 17:15:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-shared-io (Old) and /work/SRC/openSUSE:Factory/.maven-shared-io.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maven-shared-io" Thu May 16 17:15:53 2024 rev:5 rq:1174348 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-shared-io/maven-shared-io.changes 2024-02-21 18:00:36.640404271 +0100 +++ /work/SRC/openSUSE:Factory/.maven-shared-io.new.1880/maven-shared-io.changes 2024-05-16 17:18:07.246327491 +0200 @@ -1,0 +2,5 @@ +Thu May 16 05:18:49 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Use sisu-plexus instead of plexus-containers-container-default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-shared-io.spec ++++++ --- /var/tmp/diff_new_pack.uUVsVE/_old 2024-05-16 17:18:08.118359097 +0200 +++ /var/tmp/diff_new_pack.uUVsVE/_new 2024-05-16 17:18:08.122359242 +0200 @@ -33,8 +33,8 @@ BuildRequires: maven-lib BuildRequires: maven-shared-utils BuildRequires: maven-wagon-provider-api -BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildRequires: unzip BuildArch: noarch @@ -64,8 +64,8 @@ maven/maven-plugin-api \ maven-wagon/provider-api \ maven-shared-utils/maven-shared-utils \ - plexus/utils \ - plexus-containers/plexus-container-default + org.eclipse.sisu.plexus \ + plexus/utils # Some of the tests cannot run outside maven %{ant} \

1 0