summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29291 -> 29285 bytes
-rw-r--r--media-video/Manifest.gzbin25380 -> 25379 bytes
-rw-r--r--media-video/subtitlecomposer/Manifest6
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch67
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch32
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch25
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch25
-rw-r--r--media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch45
-rw-r--r--media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild64
-rw-r--r--metadata/Manifest.gzbin6320 -> 6315 bytes
-rw-r--r--metadata/dtd/timestamp.chk2
-rw-r--r--metadata/glsa/Manifest28
-rw-r--r--metadata/glsa/timestamp.chk2
-rw-r--r--metadata/md5-cache/Manifest.gzbin27903 -> 27900 bytes
-rw-r--r--metadata/md5-cache/media-video/Manifest.gzbin38558 -> 38724 bytes
-rw-r--r--metadata/md5-cache/media-video/subtitlecomposer-0.7.1-r317
-rw-r--r--metadata/md5-cache/net-print/Manifest.gzbin7301 -> 7458 bytes
-rw-r--r--metadata/md5-cache/net-print/cnijfilter2-6.6014
-rw-r--r--metadata/md5-cache/sys-apps/Manifest.gzbin88807 -> 88803 bytes
-rw-r--r--metadata/md5-cache/sys-apps/dbus-1.15.82
-rw-r--r--metadata/news/Manifest28
-rw-r--r--metadata/news/timestamp.chk2
-rw-r--r--metadata/timestamp2
-rw-r--r--metadata/timestamp.chk2
-rw-r--r--metadata/timestamp.commit2
-rw-r--r--metadata/timestamp.x2
-rw-r--r--metadata/xml-schema/timestamp.chk2
-rw-r--r--net-print/Manifest.gzbin5750 -> 5747 bytes
-rw-r--r--net-print/cnijfilter2/Manifest2
-rw-r--r--net-print/cnijfilter2/cnijfilter2-6.60.ebuild79
-rw-r--r--sys-apps/Manifest.gzbin49697 -> 49696 bytes
-rw-r--r--sys-apps/dbus/Manifest2
-rw-r--r--sys-apps/dbus/dbus-1.15.8.ebuild10
34 files changed, 434 insertions, 58 deletions
diff --git a/Manifest b/Manifest
index 4f7e594e92ef..b274d4c8d5cd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29291 BLAKE2B 8c0660812f0fd78cf55b9d09fac1fc5135a92319e543cb8159e606eb86892c57cf643cc48607b2a38bc3cd6a7facbcaa4678b6fabe323fdcf3e80883b56d2016 SHA512 ce21f6a4025cd514f5a3960157bc7bdea430b66f2b927e33ce3e01603af7ada8a51a36cc19596bfc426e44a2c02ccec52069ceca1fd4d958e02f939d386a8597
-TIMESTAMP 2023-09-02T20:40:12Z
+MANIFEST Manifest.files.gz 29285 BLAKE2B afd36248586bcda40be9b0cf714c2980009721dcdf6f5a05b4ed505d7c3b11d7494e15aa65b58b267f2a4367fdb63bc4e82137fb25597f694f601c4eef31cc31 SHA512 6ecb01a891c0ebe9f2af880475c1e9a18a9165e7c16bd582e3d987c010cebdbec45707a4eae7f3435200cd3e08773de287c805758804054fbf0fd8e0dc06bbfd
+TIMESTAMP 2023-09-03T02:40:14Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTznaxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTz8g5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDqsQ/+JJmiNdKzq1dzKNyDZY48kChtECydxJaTLMK5T8rYcs9Xy3t5lEfEHQbF
-ga+2LFraSX4fbj0FDfXRWPdlQIhkxTJqBBy0p9+vqwbUQXeB89uGvZjI0C2or8B9
-dNEajo4BEzIK1uROOiT/izKHjWI59kYRyRyMNl3QzECxyD3/Q5/JjAOb7HDr/D4f
-PeBztexnnJpBp7Efc4B04kCSkI2uF4BLUr86np2lS9gUtir6cBE8PF6zEBtvSEzw
-K/v7E2JW2ziBiOa8eCu/t3BL2ok1dCmL3MS/aQ/t7ipZPrX5G22D6UZppfF5vFOV
-LWKCuBht9tV0U7egSPPlCCeRJLh2keCuLFcRbQ1t/UXtwdQnPrjzREgTLrQ1ZXie
-aOaH+maBr6Y62JQIY67Mze+NA9UEM3csb+lHIx0KDeuYmPjoxG/KCbc+bNfpPplT
-R0h3AgxY4ooaD9YIfXmxHKhXjjkspp9O2wzctNIudBGDle5iNUAgMEoMC4zUgV1T
-psthS8Efs9SImtE646gEUaBrqGTD1cqI7dWcc0Guat8fgsJITBZcqi0Q36RIMbEw
-RABi4WCDjLZzYyasV2nGGmJW0rXxN11nZhnK/0H9GIbOQ850oSmf/wtdgCSJ7sXk
-hdaimU9ZoetqZco5Tff1w5pkl+zAON6DidAWjM9PcNqHF5LobDc=
-=optL
+klCUkhAAilf84fmdqShrIw/EIa1mlUubPHIqEk13qPHTkRwO5h989ojxNuiCsRzt
+QRIRX81c3D9ie9pvuW4dIi1jzv6DFj2XWEZFzfv6vYpHBNrqUKsgJexDOUgL6MLf
+9kgW6yvvRja+m7Ys8rtfnorePAhcCvhVs+elzcrBjQergDejR4f5TuIEEYkeG4ei
+9L/O+QYmKRrN3CN+hB3TJh55DP33ydD0HIHpsV5WpSxCthIV3aSgaIBL10/UJH8q
+fZwpvXp27OFO+TYmKhU4hHAqC3tS1/bfFlULYYQlNoDuHEFkdMo6SrAkEdqAaqxT
+oyed5hmkqOZIG5hnpH2iLM7vHfemuLDxs5FriH2BPLcJdLq/OkdBU20bIp8Xrn/8
+CWFZnEl8848mkDhMWjJQ6SygoDGF6bO5bYT1NActKF2vBkkwMrYida+r2HobE/L1
+o05t7M5yjWnhgr+TDghJviqUcWT87pBiU+ODuibpLPVRmQWXJUYX7BgA7tvqu9Sp
+mCrWKSvOeCy4k3VG1sZOxrs8RPDbp94JTJLjz8IIa/m2HIdj5scne8cCXIguNqMw
+U4fpOJ82eBsJiviwvGbTX90Nm0KelaUdc76WswJZtnYVtBlsUBiFtDXFvkH4Xo4J
+Q+Ta9PzY1yvZdOfxRwiSr4V/xZemA6KY6kRCKfixNMxhsOQPRO8=
+=EEpD
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f302ac4ce816..6907ef3f22e5 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e9135a9f25e4..a2df8fbc100b 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 5e1fc57a8def..27b06349c7d6 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,6 +1,12 @@
+AUX subtitlecomposer-0.7.1-changingaudio-crashfix.patch 2659 BLAKE2B 6e2ccc7ee687cb8353f36101b9b824adc9e6e3ec0d6574de08f08483e73cf12964f598d657b48aa2b7f322d66df3fca28fba9a85580da36a0aed90cf8bc535dc SHA512 54eeded590bfe56770798e9cc384fc92a41e9885dc9c7a700939cd4a7e55ceb543017445c6ca800e83a61d58ed9c05c0267172e2ece03402d5bd6f1cc5cdef18
AUX subtitlecomposer-0.7.1-ffmpeg6-1.patch 938 BLAKE2B 2b948713b9288770dafce137f4a9127215f6cfc98cc051b09b76b2d03a4aaefedf7b50aa3a95c1620ad252e9a4716809e9f6774a5efd950fbd05e4f719f8d401 SHA512 e79cfd5aadd9117dc3d1c03ddd2f8ce2083cc279868abf63285b7248b0010eef1c7b8b717584750a148c8aee41378a7349ebfe29eaa93438b053fe40eb6e7a87
AUX subtitlecomposer-0.7.1-ffmpeg6-2.patch 1691 BLAKE2B 8d7e32d7d04314a2b650bde55085936f0cdd63b0d84a562f357a2ac9e49ace1298b019c5786ac540209dee3838d8079ccede01ec44ed6502a26e74f9649ce9ef SHA512 9e3c5beb97cd9b9dd365b0c04e90db3b714f36ad396313e7ea1c43f3aded5342f8fb49ece4b780586fd4e3732ed8bfb82fc184102eb3b0f05e5f14a84c23c7f4
+AUX subtitlecomposer-0.7.1-ffmpeg6-3.patch 1268 BLAKE2B 49f072f8fddfde3e9db6579493af12987f32d4980d389defa2d2662e64942daf1a1232d894102856b0f327a2e19a810640803fdc968a6fd458edfefdab425f3b SHA512 35fe30d123aafef39f6684407bd9bbe86e85f9a9fcabf9cd91971dbd7b51acd9f48f1f2d2242f062cc02ba516f15aa8903beb210e74b7a465f45feaa5f0a4a6d
+AUX subtitlecomposer-0.7.1-nullptr-deref.patch 817 BLAKE2B ca8b141c6618d2be1c91cd7c17737dedb6192e5812e0fffadda4e45fc9cd793140b6b6401362f9ce7129aba2be48555afc15925f00360f48722b3dfd3bbdb08d SHA512 86d192ddbbdf4ed7162745c0683e1ccc4b8e12a2e5e12947fcfe6c3dc280318e3b666eaf02678f7ff63ead0e86b90915b1abc91f62b9fa9a405162c21ebe9868
+AUX subtitlecomposer-0.7.1-subtitle-crashfix.patch 870 BLAKE2B 6bc7dda7b42d43e2f1a06519a7873f6410fff1de8656f96490f5c71ee0c5cf746f7577e9aba624df67329e4cf7a4ae507c5d67d8bda90e9e5898e19d41392e19 SHA512 d667f2eb818333bdaf3475494b76d1339ab36d7e96c1c4f8cc1cfbf0714677dad60f427ffa4c5834bdaeccddad0ee3f8bd9f0e22560de4b2ca4f095f2ba0f046
+AUX subtitlecomposer-0.7.1-vobsub-crashfix.patch 1676 BLAKE2B 8fba201110d302e4279fe487567e7b826cad51743ed4d8ddc786fa18cc0bc4d561550c22b1a03696ef6eb2854b9a82866d74bd3066e083647f205ebc816d9e4a SHA512 fb7d4d69b5aff564b51dc6260735dc6739475c797aae6fe94f69ebd745a5a45b62111ccf7154f2de59458403e8d3d1eb48dad3e87f152c2f7741a9dd0d928ad4
DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
EBUILD subtitlecomposer-0.7.1-r2.ebuild 1625 BLAKE2B cd30be03ee998661c3cd1b2e15eff026bbb1e0b803452023a61e9ab4f20d0318624fd2ff15b3f88dceb15467ba586e26a25721a215d91677ddf4f75d9a758c1e SHA512 6353b46489e305facd11b2ba7020382fadc74f8bb56593a97180f34322aabb486ecfd97ac900cedc6efb3df313312ee8ef0ff40d62137237c11beb900809c21f
+EBUILD subtitlecomposer-0.7.1-r3.ebuild 1771 BLAKE2B 196bd181b2518429e4a14de5f58b73a1839e12105497bd49a4e623260d477976124e02573c4a2eac36d51f16837c45c6f47a74d1e5f0705107f3148e39291808 SHA512 8630c41ab78445419ca9c4e638079feb92d718b1fdab949c3ac1df612af5418f6728ad448fd955b81a19be2094ad1507d020ee6ce0d3fa02b60e94badbbe1216
MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
new file mode 100644
index 000000000000..be580af101d5
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
@@ -0,0 +1,67 @@
+From 88a6cf4e4aaa58229b9b07d66c2abd264dfbc2f1 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Fri, 17 Jun 2022 21:34:20 +0200
+Subject: [PATCH] Fix deadlock/crash while changing audio stream on
+ paused/stopped media #71
+
+---
+ src/videoplayer/backend/audiodecoder.cpp | 2 +-
+ src/videoplayer/backend/decoder.cpp | 1 +
+ src/videoplayer/backend/ffplayer.cpp | 2 ++
+ src/videoplayer/videoplayer.cpp | 2 ++
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/audiodecoder.cpp b/src/videoplayer/backend/audiodecoder.cpp
+index d3d13e78..9c7ee1fc 100644
+--- a/src/videoplayer/backend/audiodecoder.cpp
++++ b/src/videoplayer/backend/audiodecoder.cpp
+@@ -499,7 +499,7 @@ AudioDecoder::run()
+ // bytes needed for 100ms of audio
+ const ALint hwMinBytes = m_vs->audClk.speed() * m_fmtTgt.bytesPerSec * .100;
+
+- while(!m_vs->abortRequested) {
++ while(!m_vs->abortRequested && !isInterruptionRequested()) {
+ ALint hwBufOffset = 0;
+ alGetSourcei(m_alSrc, AL_BYTE_OFFSET, &hwBufOffset);
+ if(!std::isnan(af->pts)) {
+diff --git a/src/videoplayer/backend/decoder.cpp b/src/videoplayer/backend/decoder.cpp
+index 79b1ad7a..8a69d918 100644
+--- a/src/videoplayer/backend/decoder.cpp
++++ b/src/videoplayer/backend/decoder.cpp
+@@ -155,6 +155,7 @@ Decoder::abort()
+ m_queue->abort();
+ if(m_frameQueue)
+ m_frameQueue->signal();
++ requestInterruption();
+ wait();
+ m_queue->flush();
+ }
+diff --git a/src/videoplayer/backend/ffplayer.cpp b/src/videoplayer/backend/ffplayer.cpp
+index 88288285..7b26e4a4 100644
+--- a/src/videoplayer/backend/ffplayer.cpp
++++ b/src/videoplayer/backend/ffplayer.cpp
+@@ -288,6 +288,8 @@ FFPlayer::activeAudioStream()
+ void
+ FFPlayer::activeAudioStream(int streamIndex)
+ {
++ if(!m_vs)
++ return;
+ streamIndex = streamIndex < 0 ? -1 : m_vs->demuxer->absoluteStreamIndex(AVMEDIA_TYPE_AUDIO, streamIndex);
+ m_vs->demuxer->selectStream(AVMEDIA_TYPE_AUDIO, streamIndex);
+ }
+diff --git a/src/videoplayer/videoplayer.cpp b/src/videoplayer/videoplayer.cpp
+index 0307ce7d..a42babe5 100644
+--- a/src/videoplayer/videoplayer.cpp
++++ b/src/videoplayer/videoplayer.cpp
+@@ -301,6 +301,8 @@ VideoPlayer::setupNotifications()
+
+ //connect(m_player, &FFPlayer::videoStreamsChanged, this, [this](const QStringList &streams){});
+ connect(m_player, &FFPlayer::audioStreamsChanged, this, [this](const QStringList &streams){
++ if(m_activeAudioStream >= 0)
++ m_player->activeAudioStream(m_activeAudioStream);
+ emit audioStreamsChanged(m_audioStreams = streams);
+ emit activeAudioStreamChanged(m_activeAudioStream = m_player->activeAudioStream());
+ });
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
new file mode 100644
index 000000000000..2887f179afd1
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
@@ -0,0 +1,32 @@
+From d8f9797d9c0d45fa9f4402f79c539544b74d2cc7 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Fri, 1 Apr 2022 08:35:17 +0200
+Subject: [PATCH] VideoPlayer: Fix usage of deprecated/removed AVCodec option
+ #68
+
+AVCodecContext.refcounted_frames was useful for deprecated API only
+(avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
+(avcodec_send_packet/avcodec_receive_frame) always work with reference
+counted frames
+
+https://github.com/FFmpeg/FFmpeg/commit/b1cf151c4dfdbd049cd41863b4e0cde927585e17
+---
+ src/videoplayer/backend/streamdemuxer.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp
+index e8320ea0..7173306f 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
++++ b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -286,8 +286,6 @@ StreamDemuxer::componentOpen(int streamIndex)
+ av_dict_set(&opts, "threads", "auto", 0);
+ if(stream_lowres)
+ av_dict_set_int(&opts, "lowres", stream_lowres, 0);
+- if(avCtx->codec_type == AVMEDIA_TYPE_VIDEO || avCtx->codec_type == AVMEDIA_TYPE_AUDIO)
+- av_dict_set(&opts, "refcounted_frames", "1", 0);
+ if((ret = avcodec_open2(avCtx, codec, &opts)) < 0) {
+ goto fail;
+ }
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch
new file mode 100644
index 000000000000..d6417179d436
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch
@@ -0,0 +1,25 @@
+From c94e4dc1362b9ac03cddb9def913ea6728875fe2 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Sun, 18 Sep 2022 23:09:17 +0200
+Subject: [PATCH] Fixed possible null pointer deref
+
+---
+ src/videoplayer/backend/streamdemuxer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp
+index d15cf9f4..4ae4171d 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
++++ b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -45,7 +45,7 @@ isRealTime(AVFormatContext *s)
+ #else
+ const char *url = s->url;
+ #endif
+- if(s->pb && (!strncmp(url, "rtp:", 4) || !strncmp(url, "udp:", 4)))
++ if(s->pb && url && (!strncmp(url, "rtp:", 4) || !strncmp(url, "udp:", 4)))
+ return 1;
+ return 0;
+ }
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch
new file mode 100644
index 000000000000..4502d7254f9b
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch
@@ -0,0 +1,25 @@
+From 09e5d80286276d4683c944dfa0cddda3479006c0 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Thu, 19 Jan 2023 18:39:31 +0100
+Subject: [PATCH] Subtitle: fixed crash in splitLines()
+
+---
+ src/core/subtitle.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/subtitle.cpp b/src/core/subtitle.cpp
+index d3da532d..3359062e 100644
+--- a/src/core/subtitle.cpp
++++ b/src/core/subtitle.cpp
+@@ -541,7 +541,7 @@ Subtitle::splitLines(const RangeList &ranges)
+ c->insertText(QString(QChar::LineFeed));
+ return true;
+ }
+- if(text.at(j) == QChar::Space) {
++ if(j < len && text.at(j) == QChar::Space) {
+ c->movePosition(QTextCursor::Start);
+ c->movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, j);
+ c->movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch
new file mode 100644
index 000000000000..20c5835ba971
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch
@@ -0,0 +1,45 @@
+From 78553af05ba97da0920f7cabd281503bd4ca484a Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Wed, 23 Nov 2022 15:47:56 +0100
+Subject: [PATCH] VobSub: fixed crash when moving to previous image
+
+Do not delete lines on temporary Subtitle that is shown in LinesWidget.
+SubtitleLine is deleted immediately, while LinesWidget wants to repaint
+before line reference is removed from its list model.
+
+https://bugs.kde.org/show_bug.cgi?id=462156
+---
+ src/formats/vobsub/vobsubinputprocessdialog.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/formats/vobsub/vobsubinputprocessdialog.cpp b/src/formats/vobsub/vobsubinputprocessdialog.cpp
+index ac54b552..2ba61550 100644
+--- a/src/formats/vobsub/vobsubinputprocessdialog.cpp
++++ b/src/formats/vobsub/vobsubinputprocessdialog.cpp
+@@ -697,9 +697,12 @@ VobSubInputProcessDialog::processNextPiece()
+ piecePrev = piece;
+ }
+
+- SubtitleLine *l = new SubtitleLine((*m_frameCurrent)->subShowTime, (*m_frameCurrent)->subHideTime);
++ SubtitleLine *l = m_subtitle->line((*m_frameCurrent)->index);
++ if(!l) {
++ l = new SubtitleLine((*m_frameCurrent)->subShowTime, (*m_frameCurrent)->subHideTime);
++ m_subtitle->insertLine(l);
++ }
+ l->primaryDoc()->setPlainText(subText);
+- m_subtitle->insertLine(l);
+
+ ui->grpText->setDisabled(true);
+ ui->grpNavButtons->setDisabled(true);
+@@ -809,8 +812,6 @@ VobSubInputProcessDialog::onPrevImageClicked()
+ return;
+
+ --m_frameCurrent;
+- if(m_subtitle->lastIndex() >= 0)
+- m_subtitle->removeLines(RangeList(Range(m_subtitle->lastIndex())), Both);
+
+ ui->progressBar->setValue((*m_frameCurrent)->index + 1);
+
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..6be3556ee1b8
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Text-based subtitles editor"
+HOMEPAGE="https://subtitlecomposer.kde.org/"
+PATCHSET="${P}-patchset-1"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ media-libs/openal
+ media-video/ffmpeg:0=
+ unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch"
+ "${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035
+ "${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416
+ "${WORKDIR}/${PATCHSET}/${P}-replace-kross-w-qjsengine.patch" # bug 755956
+ "${FILESDIR}"/${P}-nullptr-deref.patch
+ "${FILESDIR}"/${P}-ffmpeg6-{1,2,3}.patch # bugs 910048, 913475
+ "${FILESDIR}"/${P}-{changingaudio,subtitle,vobsub}-crashfix.patch # KDE-bug 462156
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434
+ $(cmake_use_find_package unicode ICU)
+ )
+
+ ecm_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b1f7107953d3..a5fa95c50799 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
Binary files differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd5cfae8e97e..97af24776326 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Sep 2023 20:40:07 +0000
+Sun, 03 Sep 2023 02:40:09 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a22e35e2889b..710cda104a82 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-09-02T20:40:11Z
+TIMESTAMP 2023-09-03T02:40:13Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTznatfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTz8g1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAF3RAAg6f/FT5F7iJ1wiLEg+6yrvv9J7Giv0CUhlaVLliRBB2TpOLfLOd3r2Er
-/TajWKE5oTSHDyj/pTNG+UFl6VZjeNuPzu/15hEWKvK9qq1qZFmcXpY2SqFc4ku1
-rIj5ywgyTO8xeBR/Th1dgL3eYBnBD1MPIQQrcNJkMVDaaC09FM6oeQL+eZDBlW0I
-lX6qt7uthvTo30UeleS9kdGhyOh4sqRI/DX5jteNS+r41l/pr6vT9X1lfFbVQywa
-AVJE30n8is+yepD0JoA3I31JuzpzvxkNzR+Y0iUKOVa1FAvTF2bJn1bhR7Y1wjS5
-MPjQdkxNLE2U2P9cmYA3EDLj/3aX4RrUlK/dO2vGDAsl88ZH0HH9jcC6InZ1ZDaD
-bxBH/eScSycONMjmqtNQrmeNPFg+SD85Tg1ZnfUVPHqwp2cqDwZxiTt4a6JKzVWS
-MT2xjT+F6vDiHQ4qb0az/MXSS5umRzB12z+QrqCOvIWrT+HVpwh4WeaXsG5Y6huh
-WhhOvzro4rSysC/7+KTiYAyMm6Rne5TD19sryJXTbjue5CYikRKl/nYfOKZBYyn1
-DUnJpfB9eBpz/bIwXda9EeJc+ssB5p0YIHzLn7gUJZGifXmoG+rc/qDYDEZIAu2f
-WStkBhKNAwtq+6cLWLDaK0nwjilNn1pInL3WMMdWxL1x/NXIpvA=
-=HqbI
+klDdXA/9FfqW89QG5kY/fkTdp5sv44mvmg0uZ4mEa6Oo2IZUX+TP0p9hThF+Bis+
+oP+nKhLz9R80B6OUiT21kG0ibh2lw1wpdJvNZiIE10G6qgnswzJqWCZa0oV6iZaR
++OHGFzFYmaYXG/XYQ9aZriDUgWsjoFqo37K594DQJ2+3TpkpeKbvMrMVCKrKsiJs
+59twSYc/Bed+Vw0OgGlpPri+FuRTZhbisqkMVYBcRz9TqTt0EKHlgCLiXVZQy179
+bnzhIFrnSmsiJR7BRLlMaxsexVFAReBPlNk3sUaSWu/3qSV/TzN0f4eBuRfZVgNm
+9tGlgwFczLj4T1oGYvCMaIKMqZT0VHURRBhhKnUHQOeMNw4wBl8mtgAqN0LAXyuT
+k0ovMup9dYkz49mwKsBow/eHFkkfFMQJ3L6kfzQ3OzYfZO4GJyTGEgnpvxOPueVo
+eLjEHsySgq+XSKXt35caqjcSwoyZHN0phyMy56qAWBtHdLVme8ta4kzIXhTRE2HO
+l3hFnSZHqG+v2dWl5ecpBbnz9z6UVGMFhdYWt+NxaoT+3RIW7JaDmW9ItMjhtMch
+FxxvHf5GnueLU3Pfsr97OZv9LisoHORgEdGpuczCWqBdPNgDJvdOkSlj3S6+K6fR
+Gm6axVgRvdRZqxGrXmjByoiA+sv15EsxyQGCX5xkRKYjIvfmySI=
+=d0C4
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7d6a1fb16f05..97af24776326 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Sep 2023 20:40:08 +0000
+Sun, 03 Sep 2023 02:40:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index de41ccdd6a93..3479aae0e899 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index f2cc0b84a9b0..4f2a4e0bc660 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.7.1-r3 b/metadata/md5-cache/media-video/subtitlecomposer-0.7.1-r3
new file mode 100644
index 000000000000..027f6ba8610e
--- /dev/null
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.7.1-r3
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kcodecs-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 >=kde-frameworks/sonnet-5.106.0:5 media-libs/openal media-video/ffmpeg:0= unicode? ( dev-libs/icu:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Text-based subtitles editor
+EAPI=8
+HOMEPAGE=https://subtitlecomposer.kde.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=unicode debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kcodecs-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 >=kde-frameworks/sonnet-5.106.0:5 media-libs/openal media-video/ffmpeg:0= unicode? ( dev-libs/icu:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/subtitlecomposer/subtitlecomposer-0.7.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/subtitlecomposer-0.7.1-patchset-1.tar.xz
+_eclasses_=cmake ea305d3be967deed8faa5c9e94f9aee4 ecm 582ef00537aa518e5a8ca3aa66bd9dc0 flag-o-matic be27a904c614cb93ae037762dc69bcc2 kde.org 411cb92019a6e2aa174d06896084bf57 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c toolchain-funcs 862d337d98edb576796827be2c6b11ca virtualx 817571665ee28575da44ee08135089e5 xdg 4a14c5c24f121e7da66e5aab4a168c6e xdg-utils baea6080dd821f5562d715887954c9d3
+_md5_=5f488393c5bea2adb86b023305e89010
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 22b0b92cbca6..c5beb6c2a519 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-print/cnijfilter2-6.60 b/metadata/md5-cache/net-print/cnijfilter2-6.60
new file mode 100644
index 000000000000..64de8d22b591
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnijfilter2-6.60
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup
+DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+DESCRIPTION=IJ Printer Driver
+EAPI=7
+HOMEPAGE=https://www.usa.canon.com/support/p/pixma-g4270#idReference%3Dsoftware-drivers
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=Canon-IJ
+RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+SLOT=0
+SRC_URI=https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTc1MzAx -> cnijfilter2-source-6.60-1.tar.gz
+_eclasses_=autotools 6ae9a4347149b19a112caa1182d03bde gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 9d3a9a889a6fa62ae794f817c156491b multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs 862d337d98edb576796827be2c6b11ca
+_md5_=cacc98cb75ac4c596b0c5b773443b67c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index bdb943515e92..57a937e96d62 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sys-apps/dbus-1.15.8 b/metadata/md5-cache/sys-apps/dbus-1.15.8
index 570678a946b3..913249ef5ffa 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.15.8
+++ b/metadata/md5-cache/sys-apps/dbus-1.15.8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.15.8.tar.xz
_eclasses_=linux-info c4f1201b96a8a2c1f3b86cc8b2c71c91 meson 08b7183c3f4811568ee93eb0f79a89fe meson-multilib 8989922d980e5e870cc3de949d1b2586 multibuild 30dbf3c5a31db09a19f31ad0a68f2405 multilib c19072c3cd7ac5cb21de013f7e9832e0 multilib-build e8aed98bd43dbd25694310a660ad562c multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c out-of-source-utils 1a9007554652a6e627edbccb3c25a439 python-any-r1 f5169813d1619761b459800587005fd2 python-utils-r1 59e60e9c5cbd3f214d7f1002e798b387 readme.gentoo-r1 204091a2cde6179cd9d3db26d09412d3 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 862d337d98edb576796827be2c6b11ca virtualx 817571665ee28575da44ee08135089e5
-_md5_=1bd56f2d4901e81a770e5439d21c2094
+_md5_=2615ad30eba56ea038de014bbe4037d5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 72f57d05b80f..961c99fbd971 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-09-02T20:40:11Z
+TIMESTAMP 2023-09-03T02:40:13Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTznatfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTz8g1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBjvQ//fEZj8/jZR9d73PyDhxyv6UUeERukxtV1g4zwIH+bn6uMmnvP6Bgt3P31
-LHIfNzB+OlOSlPStHa/XPDOXdDKdccZcE5EmYZquebD0MBWsaoYOX5ySZ9lraywJ
-rOnFkKgf/ozF5x1vBeGJKyWh/20HYC9UYJXU5bs99KBKKYrpX2wCzeB517l6jbDH
-ycjoQ3mkBSF4s0atgvSZOlv2mPwN0e/IRMG6Cm9fy9KYHCa5r8ljgsdXfrD4IrkN
-3uuB5ntJJAo3Rri0QhSTSkfdOMPmsIvstlBd0msv2NMxOZ5DUKgd6XjYf58NwlL2
-TH4T90GMLcTaCHDTAYNTA4mRy66gOmxUfmr+uMEVTc0C4qgXNrYisA2RPjIShtqZ
-C4xrY9lFKVuDSLk7pcbT9iHrGJi8unWCHxH2ye3PP1zHV2V+tKfSHr/plZJKYo2X
-1Kx3s65pYioP8gr3WE3EdXvKMM3CWCp4J/GJVp7ZLVR5tSZZtT7O5tSiJdYfJZP2
-UOOkwNTZueotmUwgSzd4P4Pcxh1ZOWzEzyL7LwLhhg33jOBRU9dAMXkHPVKhsy4U
-4gfzxbBYiG/jcB+XNL2dBiJUh0wYA/9OV4Ble5E8e53h05MSNx1XH/HbY9aGH0wz
-P2E9bwGEDisVmx+qaHhaONkhkuxndldGDbagMtseK1Xs4FAvwME=
-=nD8f
+klBIsQ//X1YK79UWjwkGhdTLEtLnVzarVr70K8pWz0AEqjHXB8lppC1ZyYoemZH3
+49XW/WKnyUtCdcW8YZ+MuwnjUzIldHaVu9O+E9h00DZeeZ5M1/cMvMM+XFeI7FVU
+Xgj5NnE2KIgH0Zf/4Nwh2lOGSQ3KnWXVPhCj85u/SqzHz+0qJdZHnU+0+GAFPnoU
+i+3wgVoF2fXrdqkwOUie7QWAtop/EFM/StIo6+wILYmw4RqxAVKWtyYXGkUo/PfP
+rfrMCul16mNB2q7P7jdjSmFDUM/3YMMws00OaNVG//erSp2waGp7WUAfgi1Jf3Tc
+VccfrN2zGLO7Bvwu/LGm6LHD8oju996xbbWAGpmKOH7qmyjcJPLuqWXThpVJiePp
+Wcbsl4i+6FxUmz+FAPMPlPzIawSxyauU+6hQW4Y/L5ov7/hCm6QkkDIiEX7DuBxD
+rs7KqpiXuYjGzKMgW5O4q3KflKifBU+DuBX7eOub+/flsVFtoKygaexhYV2IEZkD
+awWytFbkuoNLPxICctIh0bAkjxPmJago7439jwCE8mu1spTpWLslx/kDtrwf5VMi
+QUNp2hZdCn3ukgNLpyDBWNWChcIpJW2Y3UBcvBX6dhFNub1DjYnSk0lpnQ3s8PyF
+7536K0Kt7JcGAT6SQUEzpaZzRtObFvRgRJQgQ6Uj9x9xLEGuA/s=
+=g3ml
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7d6a1fb16f05..97af24776326 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Sep 2023 20:40:08 +0000
+Sun, 03 Sep 2023 02:40:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 51500f1c2238..d9b462dca795 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep 2 08:40:07 PM UTC 2023
+Sun Sep 3 02:40:09 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b4dce7b53eb0..73d7ab7e68f2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Sep 2023 20:45:01 +0000
+Sun, 03 Sep 2023 02:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 93b01f698fc3..e921fef7e701 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-cde57604bf4b5d98e9362d590538bc46f867d944 1693684238 2023-09-02T19:50:38+00:00
+69e381a87b02c98c38b60f549acb47850139fb64 1693695118 2023-09-02T22:51:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 594f9bb42535..372ccae5f908 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1693687201 Sat 02 Sep 2023 08:40:01 PM UTC
+1693708801 Sun 03 Sep 2023 02:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7d6a1fb16f05..97af24776326 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 02 Sep 2023 20:40:08 +0000
+Sun, 03 Sep 2023 02:40:09 +0000
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 48fb8f58a4e7..1876df20c64c 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 809f5c5e5210..8e6542cfff4c 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -4,6 +4,8 @@ AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf3
AUX cnijfilter2-6.50-gentoo.patch 1787 BLAKE2B cb7f12a37b46dfcbdfa54fcba8a7d7260b0427cf2af005e2a8ca979609936e0d07ba66ea963ddbbd670eda362316f19bd1513de18b9d4e024b63313cdb5a5b87 SHA512 2fc38bd1e67d9fd424d47290bac5cde6e342ff091bb2583c5ccdaddd7d15ab85d37fae16e7bd08fded33d7167cbc89950bf08aafb503383b35d7143f2c19e8a2
DIST cnijfilter2-source-5.90-1.tar.gz 1707084 BLAKE2B 3df5786785b12c410f4ae72e1d20fcd7686e0b8de60e7a713392076c2cd9edc1bd3d7f7494712ec6a4f50197fdb79e4cb708fcbe5f3b9e38cb3353e74cc8291a SHA512 d31f5133b6f81114d46cb067779260d5d74b5616e6e1b3924ef9db0db233fbb2b16132f7a003342e2ed14742c3123c644619dc1d5c93bca5d16425a77d45c632
DIST cnijfilter2-source-6.50-1.tar.gz 2671420 BLAKE2B 2329388686b14430b84d928fb5197cbc58c2a44c25f0edc4c95d8be8d72d313a4c9a7daf09dba1f2bdc73d424a96a7aa3934d83235440bbe1e6edaf95bc5cf31 SHA512 98536a1f0677b1ead6d364b737d9873abf2140cf9646194937075c391929457d23bc792f9314badc27d1649cca6376bee20506e1922d6e16e857037bf7ce3508
+DIST cnijfilter2-source-6.60-1.tar.gz 2775344 BLAKE2B 0207784251e70c5850da74eb76a4de16d4dc5760e91ce17fc86ee9c61cfac27c041ea3f434ecad846ee3cc93649ac627d41eaaa55d3baf2e148ad36d8e142b87 SHA512 4a0560bcd4028dfbaed0c01a34c17eef492865bae97ebe0ec092442f49401295a160a4ac39ff3869f40d01f7cd085a97d114b9c5bf511a66664c2b74fbf41864
EBUILD cnijfilter2-5.90.ebuild 1823 BLAKE2B 75dd8111a2cd69e59819e82bdd8d1b597ce39a951fc11ccbff51bb9ff18cdcd29540f83d3611bb3a638e5d5e81d3ed7f626f4d77da15cfbeae5a123f5a439459 SHA512 4a33e1354daf5e7b1d4ac0a9c3e19ae7c26d6cef8a97436b29e2cbb5d54fa548776c945728c25498c884042084de03b09cd0d10d7c72ae975397692ee59f3f45
EBUILD cnijfilter2-6.50.ebuild 1973 BLAKE2B b22f811f0e11d5287bff842a9ba30b2c44b57d04931a70c803a9dae9ce947340c6ba53c337c38c3e46936ee5c2cad21c9ad7ee2234eef5b0226a311e1c5ae52e SHA512 8ef43706ffa16fcb83717e57c58ff1ffaafa49b19f8a525334b53fcf22154488b773feeab985da1b3a36f113313eae9ac16cad989d1c77915c05df63ef9d7a98
+EBUILD cnijfilter2-6.60.ebuild 1995 BLAKE2B 21ee1128ccb1265db46b2be3ea28d1c1a21ef4514ff3b306290cb328803838539cf5840b8f3a68e94d1ee9ef8ec456e422440e0cd83ac6929ad0ec7ed5956dc3 SHA512 24044c122c2bfba2809ff9807af882fc62a79b7384d9bd02000468c4abe47ade206660d074704572abf08f6a8ca5f09d77d0ed444d777ee183542e06e982ace5
MISC metadata.xml 248 BLAKE2B a52f1b42e34917354d5d99824d47adca0f36afbe44b9f3398cc819976181e5b067ffc621d3d02f337cc080dbb8676864fd6ae0e5b48736a124687eeea01e11ba SHA512 7524a042ca62db175429683f3aee96e272e324d3e26f9d8c28d1737c5784b72962338d49dfeb28e172d171d55e46b9b889ac471eb3a26a0b58a0b3b20fb1d0b9
diff --git a/net-print/cnijfilter2/cnijfilter2-6.60.ebuild b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
new file mode 100644
index 000000000000..8429d31348b0
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-source-${PV}-1"
+
+DESCRIPTION="IJ Printer Driver"
+HOMEPAGE="https://www.usa.canon.com/support/p/pixma-g4270#idReference%3Dsoftware-drivers"
+SRC_URI="https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTc1MzAx -> cnijfilter2-source-${PV}-1.tar.gz"
+
+LICENSE="Canon-IJ"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+ dev-libs/libxml2
+ net-print/cups"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.50-gentoo.patch
+ "${FILESDIR}"/${PN}-5.80-cflags.patch
+ "${FILESDIR}"/${PN}-5.80-fno-common.patch
+)
+
+pkg_setup() {
+ QA_PREBUILT="
+ /usr/$(get_libdir)/libcnbpnet30.so.1.0.0
+ /usr/$(get_libdir)/libcnbpcnclapicom2.so.5.0.0
+ /usr/$(get_libdir)/libcnnet2.so.1.2.5
+ /usr/$(get_libdir)/libcnbpnet20.so.1.0.0
+ /usr/bin/cnijlgmon3
+ "
+}
+
+src_prepare() {
+ default
+ DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+ LIBDIR=com/libs_bin$(usex amd64 _x86_64 _i686)
+ for d in ${DIRS}; do
+ mv "${d}"/configure.{in,ac} || die
+ done
+ echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
+ echo "AM_INIT_AUTOMAKE" >> configure.ac
+ echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
+ echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
+ echo "AC_OUTPUT()" >> configure.ac
+ echo "SUBDIRS= ${DIRS}" >> Makefile.am
+ sed -i \
+ -e "/^CFLAGS/d" \
+ */configure.ac \
+ cnijbe2/src/Makefile.am || die
+ eautoreconf
+ cd ${LIBDIR}
+ rm libcn*.so || die
+ ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
+ ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
+ ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
+ ln -sf libcnnet2.so.1.2.5 libcnnet2.so || die
+
+ cd -
+}
+
+src_configure() {
+ econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}"
+}
+
+src_install() {
+ default
+ insinto /usr/share/ppd/cupsfilters
+ doins ppd/*ppd
+ dolib.so ${LIBDIR}/*
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 36b8d8f62072..46c68adf14a6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index eef013a3fd84..dcf7a0f1879d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -8,5 +8,5 @@ DIST dbus-1.15.6.tar.xz 1406672 BLAKE2B 5c2b876ede784a82c43096e82c3fa4b905cab26a
DIST dbus-1.15.8.tar.xz 1149088 BLAKE2B 7c1962dfccc6a1b6250e80b0706d7f44536fabeff009013865ec4b1edaec6d4b47dcbe8f78caa61ef7aef4bac6b79f0e2027dd16bbb2baae328429e648bf8b8c SHA512 84b8ac194ede3bf300f4501395b7253538469a4f9d59ea4adaf800282e359ef43494d81941b338081d3704317d39f0aba14906c6490419f04f946eb9d815f46c
EBUILD dbus-1.15.4-r1.ebuild 8247 BLAKE2B 9a1bd68580813cbb9ee918e107ca8ee36b7608bf48b4e8077f908eec114196b68afc4b3aedbed503e04ff261c164bc7c7d769f779756e30896c93d6111cd882e SHA512 637746e9e795a0db3415629db10d2863773ab1082e1a679a4193b55caefaca487ea28bf672fb93593f5995cf451cc7882efd17766a5d70376bbfd62d30542a08
EBUILD dbus-1.15.6.ebuild 8167 BLAKE2B 2ff60b07e0ba9b77b6215018804fe58f9f37987c75feee4c572c1b47bc877d24fa4d92d03c7cff38121ed114ce4d6d0be2292d3adad01bb8650a74af2ad0390e SHA512 48927c7a395e07a91d466e8879b5b4942e9396b1a1ea6d7a3b4974ade9ef8b0a61f81176bc25347cb01077949cc26407b7bcdc60010f8dc4360b6749933789d7
-EBUILD dbus-1.15.8.ebuild 6560 BLAKE2B 63f139614328b6386f521d2bcea708ce72c3856c37e12b6135be3ed3ea1fda9f9f387777765139c9071486b5e8077c896cc70e946d1026bc53a84d7d7d64ab2b SHA512 f875dd635b77e3e8c2cf6443a44c4c6e83704e98aec665256b25ffb2aa7f07b72f6130adf9aedc574370fb998ae70758b3da4592a2db86e65778d776561adb1a
+EBUILD dbus-1.15.8.ebuild 6615 BLAKE2B 97c01eb1c249f105a5389b0ed2af2cb6f46e6d710946865c171013c742b5396c928620d55748347f8c5db6082c99b7285d1e9acd0052daa3ea9f1013b3b6f0cd SHA512 c30abb0468b141dbb4d01a8e29427fb9e44744c32e7d18b7270efb862a02a7d209e0ced594aab4746afba05ef16284f76b7a5f9a1baef8a44844b34ac3f1c38c
MISC metadata.xml 562 BLAKE2B 5ffb7f5e162d8aae0b6db26fae2c3fa5be300110f57e46d0829c184fc564e766f86ffff5acea3097f9bb260d4f21793f0673d1545a03b25d0283b0e29e6f9460 SHA512 e5f21ed99b2678c60477623984d3609ce9b38120f327ac462d0741164473375d4808984b3405bf0dab0918d8d481ed5768380c0085cfbe70d9f5a055eb6ddba8
diff --git a/sys-apps/dbus/dbus-1.15.8.ebuild b/sys-apps/dbus/dbus-1.15.8.ebuild
index c783689b9742..e799412b6f57 100644
--- a/sys-apps/dbus/dbus-1.15.8.ebuild
+++ b/sys-apps/dbus/dbus-1.15.8.ebuild
@@ -116,16 +116,16 @@ multilib_src_configure() {
$(meson_native_true tools)
- $(meson_feature elogind)
- $(meson_feature systemd)
+ $(meson_native_use_feature elogind)
+ $(meson_native_use_feature systemd)
$(meson_use systemd user_session)
- $(meson_feature X x11_autolaunch)
+ $(meson_native_use_feature X x11_autolaunch)
$(meson_native_use_feature valgrind)
# libaudit is *only* used in DBus wrt SELinux support, so disable it if
# not on an SELinux profile.
- $(meson_feature selinux)
- $(meson_feature selinux libaudit)
+ $(meson_native_use_feature selinux)
+ $(meson_native_use_feature selinux libaudit)
-Dsession_socket_dir="${EPREFIX}"/tmp
-Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:28:03 +0000