From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Jan Grulich To: git-commits@fedoraproject.org Subject: [rpms/glibmm2.68] rawhide: Backport upstream fix for type definition conflict with Glib 2.89.2 Date: Thu, 30 Jul 2026 12:06:16 GMT Message-ID: <178541317631.1.15251675644452670840.rpms-glibmm2.68-09136c83a837@fedoraproject.org> List-ID: X-Git-Repo: rpms/glibmm2.68 X-Git-Branch: rawhide X-Git-Rev: 09136c83a837d3fe2986bf06f6a9c5cd458ef7cd QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvZ2xpYm1tMi42OApC cmFuY2ggOiByYXdoaWRlCkNvbW1pdCA6IDA5MTM2YzgzYTgzN2QzZmUyOTg2YmYwNmY2YTljNWNk NDU4ZWY3Y2QKQXV0aG9yIDogSmFuIEdydWxpY2ggPGpncnVsaWNoQHJlZGhhdC5jb20+CkRhdGUg ICA6IDIwMjYtMDctMzBUMTQ6MDU6NTUrMDI6MDAKU3RhdHMgIDogKzg3Ly0yIGluIDIgZmlsZShz KQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2dsaWJtbTIuNjgv Yy8wOTEzNmM4M2E4MzdkM2ZlMjk4NmJmMDZmNmE5YzVjZDQ1OGVmN2NkP2JyYW5jaD1yYXdoaWRl CgpMb2c6CkJhY2twb3J0IHVwc3RyZWFtIGZpeCBmb3IgdHlwZSBkZWZpbml0aW9uIGNvbmZsaWN0 IHdpdGggR2xpYiAyLjg5LjIKCi0tLQpkaWZmIC0tZ2l0IGEvZ2xpYm1tMi42OC0yLjg4LjEtZ2xp Yl8yLjg5LjItZG9udC1kZXJpdmUtZ3RrbW0tZ3h4eC10eXBlcy5wYXRjaCBiL2dsaWJtbTIuNjgt Mi44OC4xLWdsaWJfMi44OS4yLWRvbnQtZGVyaXZlLWd0a21tLWd4eHgtdHlwZXMucGF0Y2gKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmVhYWI2OQotLS0gL2Rldi9udWxsCisr KyBiL2dsaWJtbTIuNjgtMi44OC4xLWdsaWJfMi44OS4yLWRvbnQtZGVyaXZlLWd0a21tLWd4eHgt dHlwZXMucGF0Y2gKQEAgLTAsMCArMSw3MiBAQAorRnJvbSBkMjYwODNjNDEyMTk5NThlODAyZDVk YTczM2Q0YjRkM2MzNDJlYzg5IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogS2plbGwg QWhsc3RlZHQgPGtqZWxsYWhsc3RlZHRAZ21haWwuY29tPgorRGF0ZTogU3VuLCA1IEp1bCAyMDI2 IDE2OjQ5OjUyICswMjAwCitTdWJqZWN0OiBbUEFUQ0hdIEdpbzogRW1ibGVtIGFuZCBEQnVzOjpB Y3Rpb25Hcm91cDogRG9uJ3QgZGVyaXZlIGd0a21tX19HeHh4CisgdHlwZXMKKworR0VtYmxlbSBh bmQgR0RCdXNBY3Rpb25Hcm91cCBhcmUgZGVjbGFyZWQgR19ERUNMQVJFX0ZJTkFMX1RZUEUuCitB ZGQgX0RPX05PVF9ERVJJVkVfR1RZUEUsIF9BQklfQVNfV0lUSF9ERVJJVkVEX0dUWVBFIGFuZCBf U1RSVUNUX05PVF9ISURERU4KK3RvIHRoZSBjb3JyZXNwb25kaW5nIGdsaWJtbSBjbGFzc2VzLgor LS0tCisgZ2lvL3NyYy9kYnVzYWN0aW9uZ3JvdXAuaGcgfCAxNCArKysrKysrKysrKysrKworIGdp by9zcmMvZW1ibGVtLmhnICAgICAgICAgIHwgIDQgKysrKworIDIgZmlsZXMgY2hhbmdlZCwgMTgg aW5zZXJ0aW9ucygrKQorCitkaWZmIC0tZ2l0IGEvZ2lvL3NyYy9kYnVzYWN0aW9uZ3JvdXAuaGcg Yi9naW8vc3JjL2RidXNhY3Rpb25ncm91cC5oZworaW5kZXggZmJjMDBmOC4uZmU1YzAzMiAxMDA2 NDQKKy0tLSBhL2dpby9zcmMvZGJ1c2FjdGlvbmdyb3VwLmhnCisrKysgYi9naW8vc3JjL2RidXNh Y3Rpb25ncm91cC5oZworQEAgLTIxLDYgKzIxLDE4IEBACisgX0RFRlMoZ2lvbW0sZ2lvKQorIF9Q SU5DTFVERShnbGlibW0vcHJpdmF0ZS9vYmplY3RfcC5oKQorIAorKyNpZm5kZWYgRE9YWUdFTl9T SE9VTERfU0tJUF9USElTCisrLy8gR0RCdXNBY3Rpb25Hcm91cCB3YXMgZGVjbGFyZWQgYSBmaW5h bCB0eXBlIGJldHdlZW4gR0xpYiAyLjg5LjEgYW5kIDIuODkuMi4KKysvLyBCZWZvcmUgdGhhdCwg R0RCdXNBY3Rpb25Hcm91cENsYXNzIHdhcyBub3QgZGVjbGFyZWQgaW4gR0xpYi4KKysvLyBUaGUg cHJlcHJvY2Vzc29yIG1hY3JvIEdfREJVU19BQ1RJT05fR1JPVVBfQ0xBU1Mgd2FzIGRlZmluZWQs IHRob3VnaC4KKysjaWYgIUdMSUJfQ0hFQ0tfVkVSU0lPTigyLDg5LDEpIHx8ICghR0xJQl9DSEVD S19WRVJTSU9OKDIsODksMikgJiYgZGVmaW5lZChHX0RCVVNfQUNUSU9OX0dST1VQX0NMQVNTKSkK KysgIC8vIGdsaWIgPCAyLjg5LjEgb3IgKGdsaWIgPT0gMi44OS4xIGFuZCBHX0RCVVNfQUNUSU9O X0dST1VQX0NMQVNTIGlzIGEgcHJlcHJvY2Vzc29yIG1hY3JvKQorKyAgLy8gR0RCdXNBY3Rpb25H cm91cCBpcyBub3QgYSBmaW5hbCB0eXBlLAorKyAgLy8gR0RCdXNBY3Rpb25Hcm91cENsYXNzIGlz IG5vdCBkZWNsYXJlZCBpbiBHTGliLgorKyAgdXNpbmcgR0RCdXNBY3Rpb25Hcm91cENsYXNzID0g c3RydWN0IF9HREJ1c0FjdGlvbkdyb3VwQ2xhc3M7CisrI2VuZGlmCisrI2VuZGlmIC8qIERPWFlH RU5fU0hPVUxEX1NLSVBfVEhJUyAqLworKworIG5hbWVzcGFjZSBHaW8KKyB7CisgCitAQCAtNDMs NiArNTUsOSBAQCBjbGFzcyBHSU9NTV9BUEkgQWN0aW9uR3JvdXAKKyAgIF9DTEFTU19HT0JKRUNU KEFjdGlvbkdyb3VwLCBHREJ1c0FjdGlvbkdyb3VwLCBHX0RCVVNfQUNUSU9OX0dST1VQLCBHbGli OjpPYmplY3QsIEdPYmplY3QsICwgLCBHSU9NTV9BUEkpCisgICBfSU1QTEVNRU5UU19JTlRFUkZB Q0UoR2lvOjpBY3Rpb25Hcm91cCkKKyAgIF9JTVBMRU1FTlRTX0lOVEVSRkFDRShHaW86OlJlbW90 ZUFjdGlvbkdyb3VwKQorKyAgX0RPX05PVF9ERVJJVkVfR1RZUEUgZG5sLy8gR0RCdXNBY3Rpb25H cm91cCBpcyBhIGZpbmFsIHR5cGUgc2luY2UgZ2xpYiAyLjg5LjIKKysgIF9BQklfQVNfV0lUSF9E RVJJVkVEX0dUWVBFIGRubC8vIFJlbW92ZSB3aGVuIHdlIGNhbiBicmVhayBBQkkKKysgIF9TVFJV Q1RfTk9UX0hJRERFTgorIAorIHByb3RlY3RlZDoKKyAgIF9DVE9SX0RFRkFVTFQKK2RpZmYgLS1n aXQgYS9naW8vc3JjL2VtYmxlbS5oZyBiL2dpby9zcmMvZW1ibGVtLmhnCitpbmRleCBlOGU4Y2Zi Li4yZTY0MTJmIDEwMDY0NAorLS0tIGEvZ2lvL3NyYy9lbWJsZW0uaGcKKysrKyBiL2dpby9zcmMv ZW1ibGVtLmhnCitAQCAtMTYsNiArMTYsNyBAQAorIAorICNpbmNsdWRlIDxnbGlibW0vb2JqZWN0 Lmg+CisgI2luY2x1ZGUgPGdpb21tL2ljb24uaD4KKysjaW5jbHVkZSA8Z2lvL2dpby5oPgorIAor IF9ERUZTKGdpb21tLGdpbykKKyBfUElOQ0xVREUoZ2xpYm1tL3ByaXZhdGUvb2JqZWN0X3AuaCkK K0BAIC00MCw2ICs0MSw5IEBAIGNsYXNzIEdJT01NX0FQSSBFbWJsZW0KKyB7CisgICBfQ0xBU1Nf R09CSkVDVChFbWJsZW0sIEdFbWJsZW0sIEdfRU1CTEVNLCBHbGliOjpPYmplY3QsIEdPYmplY3Qs ICwgLCBHSU9NTV9BUEkpCisgICBfSU1QTEVNRU5UU19JTlRFUkZBQ0UoSWNvbikKKysgIF9ET19O T1RfREVSSVZFX0dUWVBFIGRubC8vIEdFbWJsZW0gaXMgYSBmaW5hbCB0eXBlIHNpbmNlIGdsaWIg Mi44OS4yCisrICBfQUJJX0FTX1dJVEhfREVSSVZFRF9HVFlQRSBkbmwvLyBSZW1vdmUgd2hlbiB3 ZSBjYW4gYnJlYWsgQUJJCisrICBfU1RSVUNUX05PVF9ISURERU4KKyAKKyBwdWJsaWM6CisgICBf V1JBUF9FTlVNKE9yaWdpbiwgR0VtYmxlbU9yaWdpbiwgTk9fR1RZUEUsIGRlY2xfcHJlZml4IEdJ T01NX0FQSSkKKworLS0gCitHaXRMYWIKCmRpZmYgLS1naXQgYS9nbGlibW0yLjY4LnNwZWMgYi9n bGlibW0yLjY4LnNwZWMKaW5kZXggZDYzMjY4Mi4uY2M0MTg5MyAxMDA2NDQKLS0tIGEvZ2xpYm1t Mi42OC5zcGVjCisrKyBiL2dsaWJtbTIuNjguc3BlYwpAQCAtMTIsNiArMTIsMTIgQEAgTGljZW5z ZTogICAgICAgIExHUEwtMi4xLW9yLWxhdGVyIEFORCBHUEwtMi4wLW9yLWxhdGVyCiBVUkw6ICAg ICAgICAgICAgaHR0cDovL3d3dy5ndGttbS5vcmcvCiBTb3VyY2UwOiAgICAgICAgaHR0cHM6Ly9k b3dubG9hZC5nbm9tZS5vcmcvc291cmNlcy9nbGlibW0vJXtnbm9tZV9tYWpvcl9taW5vcl92ZXJz aW9ufS9nbGlibW0tJXt2ZXJzaW9ufS50YXIueHoKIAorIyBodHRwczovL2dpdGxhYi5nbm9tZS5v cmcvR05PTUUvZ2xpYm1tLy0vY29tbWl0L2QyNjA4M2M0MTIxOTk1OGU4MDJkNWRhNzMzZDRiNGQz YzM0MmVjODkKKyMgRml4IHR5cGUgZGVmaW5pdGlvbiBjb25mbGljdCB3aXRoIEdMaWIgMi44OS4y CisjIE5PVEU6IFJlbW92ZSAtRG1haW50YWluZXItbW9kZT10cnVlIGZyb20gbWVzb24gY29uZmln LCBhZGRlZCBQZXJsIGRlcGVuZGVuY2llcworIyBhbmQgbWFrZSAtZG9jIGFnYWluIG5vYXJjaCB3 aGVuIGRyb3BwaW5nIHRoaXMgcGF0Y2gKK1BhdGNoMTogICAgICAgICBnbGlibW0yLjY4LTIuODgu MS1nbGliXzIuODkuMi1kb250LWRlcml2ZS1ndGttbS1neHh4LXR5cGVzLnBhdGNoCisKIEJ1aWxk UmVxdWlyZXM6ICBkb3h5Z2VuCiBCdWlsZFJlcXVpcmVzOiAgZ2NjLWMrKwogQnVpbGRSZXF1aXJl czogIHBrZ2NvbmZpZyhnbGliLTIuMCkgPj0gJXtnbGliMl92ZXJzaW9ufQpAQCAtMjIsNyArMjgs MTIgQEAgQnVpbGRSZXF1aXJlczogIG1lc29uCiBCdWlsZFJlcXVpcmVzOiAgbW0tY29tbW9uCiBC dWlsZFJlcXVpcmVzOiAgcGVybC1nZW5lcmF0b3JzCiBCdWlsZFJlcXVpcmVzOiAgcGVybC1pbnRl cnByZXRlcgorQnVpbGRSZXF1aXJlczogIHBlcmwoZmVhdHVyZSkKIEJ1aWxkUmVxdWlyZXM6ICBw ZXJsKEdldG9wdDo6TG9uZykKK0J1aWxkUmVxdWlyZXM6ICBwZXJsKG9wZW4pCitCdWlsZFJlcXVp cmVzOiAgcGVybChzdHJpY3QpCitCdWlsZFJlcXVpcmVzOiAgcGVybCh3YXJuaW5ncykKK0J1aWxk UmVxdWlyZXM6ICBwZXJsKFhNTDo6UGFyc2VyKQogCiBSZXF1aXJlczogICAgICAgZ2xpYjIlez9f aXNhfSA+PSAle2dsaWIyX3ZlcnNpb259CiBSZXF1aXJlczogICAgICAgbGlic2lnYysrMzAlez9f aXNhfSA+PSAle2xpYnNpZ2NfdmVyc2lvbn0KQEAgLTQ4LDcgKzU5LDggQEAgZGV2ZWxvcGluZyBn bGlibW0gYXBwbGljYXRpb25zLgogCiAlcGFja2FnZSAgICAgICAgZG9jCiBTdW1tYXJ5OiAgICAg ICAgRG9jdW1lbnRhdGlvbiBmb3IgJXtuYW1lfSwgaW5jbHVkZXMgZnVsbCBBUEkgZG9jcwotQnVp bGRBcmNoOiAgICAgIG5vYXJjaAorIyBGSVhNRTogUmVzdG9yZSBub2FyY2ggb25jZSAtRG1haW50 YWluZXItbW9kZT10cnVlIGlzIHJlbW92ZWQKKyMgQnVpbGRBcmNoOiAgICAgIG5vYXJjaAogUmVx dWlyZXM6ICAgICAgICV7bmFtZX0gPSAle3ZlcnNpb259LSV7cmVsZWFzZX0KIFJlcXVpcmVzOiAg ICAgICBsaWJzaWdjKyszMC1kb2MKIApAQCAtNjEsNyArNzMsOCBAQCBUaGlzIHBhY2thZ2UgY29u dGFpbnMgdGhlIGZ1bGwgQVBJIGRvY3VtZW50YXRpb24gZm9yICV7bmFtZX0uCiAKIAogJWJ1aWxk Ci0lbWVzb24gLURidWlsZC1kb2N1bWVudGF0aW9uPXRydWUKKyVtZXNvbiAtRGJ1aWxkLWRvY3Vt ZW50YXRpb249dHJ1ZSBcCisgICAgLURtYWludGFpbmVyLW1vZGU9dHJ1ZQogJW1lc29uX2J1aWxk CiAKIAo=