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: Mamoru TASAKA To: git-commits@fedoraproject.org Subject: [rpms/glibmm2.4] rawhide: Backport upstream fix for type defition conflict with GLib 2.89.2 Date: Thu, 23 Jul 2026 12:37:16 GMT Message-ID: <178481023652.1.5394446179547406412.rpms-glibmm2.4-6e77ba5cb2c4@fedoraproject.org> List-ID: X-Git-Repo: rpms/glibmm2.4 X-Git-Branch: rawhide X-Git-Rev: 6e77ba5cb2c44cd965fff9ff07b887233ca56817 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZ2xpYm1tMi40CiAgICAgICAgICAgIEJyYW5jaCA6IHJhd2hpZGUKICAgICAg ICAgICAgQ29tbWl0IDogNmU3N2JhNWNiMmM0NGNkOTY1ZmZmOWZmMDdiODg3MjMzY2E1NjgxNwog ICAgICAgICAgICBBdXRob3IgOiBNYW1vcnUgVEFTQUtBIDxtdGFzYWthQGZlZG9yYXByb2plY3Qu b3JnPgogICAgICAgICAgICBEYXRlICAgOiAyMDI2LTA3LTIyVDIzOjQwOjMzKzA5OjAwCiAgICAg ICAgICAgIFN0YXRzICA6ICsxMjIvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6 IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvZ2xpYm1tMi40L2MvNmU3N2JhNWNi MmM0NGNkOTY1ZmZmOWZmMDdiODg3MjMzY2E1NjgxNz9icmFuY2g9cmF3aGlkZQoKICAgICAgICAg ICAgTG9nOgogICAgICAgICAgICBCYWNrcG9ydCB1cHN0cmVhbSBmaXggZm9yIHR5cGUgZGVmaXRp b24gY29uZmxpY3Qgd2l0aCBHTGliIDIuODkuMgoKUmVnZW5lcmF0ZSAuaCBmcm9tIC5oZyB1c2lu ZyBtYWludGFpbmVyLW1vZGUKCi0tLQpkaWZmIC0tZ2l0IGEvZ2xpYm1tMi40LnNwZWMgYi9nbGli bW0yLjQuc3BlYwppbmRleCAzZGMxNzI4Li5hN2U4MjA3IDEwMDY0NAotLS0gYS9nbGlibW0yLjQu c3BlYworKysgYi9nbGlibW0yLjQuc3BlYwpAQCAtMTQsNiArMTQsMTEgQEAgVVJMOiAgICAgICAg ICAgIGh0dHBzOi8vZ3RrbW0ub3JnLwogU291cmNlMDogICAgICAgIGh0dHBzOi8vZG93bmxvYWQu Z25vbWUub3JnL3NvdXJjZXMvZ2xpYm1tLyV7Z25vbWVfbWFqb3JfbWlub3JfdmVyc2lvbn0vZ2xp Ym1tLSV7dmVyc2lvbn0udGFyLnh6CiAKIFBhdGNoMDogICAgICAgICBnbGlibW0yNC1nY2MxMS5w YXRjaAorIyBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ2xpYm1tLy0vY29tbWl0L2Qy NjA4M2M0MTIxOTk1OGU4MDJkNWRhNzMzZDRiNGQzYzM0MmVjODkKKyMgaHR0cHM6Ly9naXRsYWIu Z25vbWUub3JnL0dOT01FL2dsaWJtbS8tL2NvbW1pdC9iMzUzYThiMGFmYzFhYTc4ZjNlZWM1ODIy OWYwMmFjZDlmYWI2ZDNlCisjIEZpeCB0eXBlIGRlZmluaXRpb24gY29uZmxpY3Qgd2l0aCBHTGli IDIuODkuMgorUGF0Y2gxOiAgICAgICAgIGdsaWJtbTI0LTIuNjYuOS1nbGliXzIuODkuMi10eXBl LWRlZmluaXRpb24ucGF0Y2gKKwogCiBCdWlsZFJlcXVpcmVzOiAgZG94eWdlbgogQnVpbGRSZXF1 aXJlczogIGdjYy1jKysKQEAgLTIzLDcgKzI4LDEyIEBAIEJ1aWxkUmVxdWlyZXM6ICBtZXNvbgog QnVpbGRSZXF1aXJlczogIG1tLWNvbW1vbgogQnVpbGRSZXF1aXJlczogIHBlcmwtZ2VuZXJhdG9y cwogQnVpbGRSZXF1aXJlczogIHBlcmwtaW50ZXJwcmV0ZXIKK0J1aWxkUmVxdWlyZXM6ICBwZXJs KGZlYXR1cmUpCiBCdWlsZFJlcXVpcmVzOiAgcGVybChHZXRvcHQ6OkxvbmcpCitCdWlsZFJlcXVp cmVzOiAgcGVybChvcGVuKQorQnVpbGRSZXF1aXJlczogIHBlcmwoc3RyaWN0KQorQnVpbGRSZXF1 aXJlczogIHBlcmwod2FybmluZ3MpCitCdWlsZFJlcXVpcmVzOiAgcGVybChYTUw6OlBhcnNlcikK IEJ1aWxkUmVxdWlyZXM6ICBwa2djb25maWcoZ2xpYi0yLjApID49ICV7Z2xpYjJfdmVyc2lvbn0K IEJ1aWxkUmVxdWlyZXM6ICBwa2djb25maWcoc2lnYysrLTIuMCkgPj0gJXtsaWJzaWdjX3ZlcnNp b259CiAKQEAgLTc2LDcgKzg2LDggQEAgVGhpcyBwYWNrYWdlIGNvbnRhaW5zIHRoZSBmdWxsIEFQ SSBkb2N1bWVudGF0aW9uIGZvciAle25hbWV9LgogCiAKICVidWlsZAotJW1lc29uIC1EYnVpbGQt ZG9jdW1lbnRhdGlvbj10cnVlCislbWVzb24gLURidWlsZC1kb2N1bWVudGF0aW9uPXRydWUgXAor ICAgIC1EbWFpbnRhaW5lci1tb2RlPXRydWUKICVtZXNvbl9idWlsZAogCiAKCmRpZmYgLS1naXQg YS9nbGlibW0yNC0yLjY2LjktZ2xpYl8yLjg5LjItdHlwZS1kZWZpbml0aW9uLnBhdGNoIGIvZ2xp Ym1tMjQtMi42Ni45LWdsaWJfMi44OS4yLXR5cGUtZGVmaW5pdGlvbi5wYXRjaApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kMTA4YzI1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2xp Ym1tMjQtMi42Ni45LWdsaWJfMi44OS4yLXR5cGUtZGVmaW5pdGlvbi5wYXRjaApAQCAtMCwwICsx LDExMCBAQAorRnJvbSBkMjYwODNjNDEyMTk5NThlODAyZDVkYTczM2Q0YjRkM2MzNDJlYzg5IE1v biBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogS2plbGwgQWhsc3RlZHQgPGtqZWxsYWhsc3Rl ZHRAZ21haWwuY29tPgorRGF0ZTogU3VuLCA1IEp1bCAyMDI2IDE2OjQ5OjUyICswMjAwCitTdWJq ZWN0OiBbUEFUQ0hdIEdpbzogRW1ibGVtIGFuZCBEQnVzOjpBY3Rpb25Hcm91cDogRG9uJ3QgZGVy aXZlIGd0a21tX19HeHh4CisgdHlwZXMKKworR0VtYmxlbSBhbmQgR0RCdXNBY3Rpb25Hcm91cCBh cmUgZGVjbGFyZWQgR19ERUNMQVJFX0ZJTkFMX1RZUEUuCitBZGQgX0RPX05PVF9ERVJJVkVfR1RZ UEUsIF9BQklfQVNfV0lUSF9ERVJJVkVEX0dUWVBFIGFuZCBfU1RSVUNUX05PVF9ISURERU4KK3Rv IHRoZSBjb3JyZXNwb25kaW5nIGdsaWJtbSBjbGFzc2VzLgorLS0tCisgZ2lvL3NyYy9kYnVzYWN0 aW9uZ3JvdXAuaGcgfCAxNCArKysrKysrKysrKysrKworIGdpby9zcmMvZW1ibGVtLmhnICAgICAg ICAgIHwgIDQgKysrKworIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKQorCitkaWZm IC0tZ2l0IGEvZ2lvL3NyYy9kYnVzYWN0aW9uZ3JvdXAuaGcgYi9naW8vc3JjL2RidXNhY3Rpb25n cm91cC5oZworaW5kZXggYWU5YmI2ZmQuLjI3MzU5YmZlIDEwMDY0NAorLS0tIGEvZ2lvL3NyYy9k YnVzYWN0aW9uZ3JvdXAuaGcKKysrKyBiL2dpby9zcmMvZGJ1c2FjdGlvbmdyb3VwLmhnCitAQCAt MjEsNiArMjEsMTcgQEAKKyBfREVGUyhnaW9tbSxnaW8pCisgX1BJTkNMVURFKGdsaWJtbS9wcml2 YXRlL29iamVjdF9wLmgpCisgCisrI2lmbmRlZiBET1hZR0VOX1NIT1VMRF9TS0lQX1RISVMKKysv LyBOZWNlc3NhcnkgaWYgY29tcGlsZWQgYWdhaW5zdCBnbGliIDwgMi44OS4xLCB3aGVyZSBHREJ1 c0FjdGlvbkdyb3VwIGlzIG5vdAorKy8vIGEgZmluYWwgdHlwZSwgYW5kIEdEQnVzQWN0aW9uR3Jv dXBDbGFzcyBpcyBub3QgZGVmaW5lZCBieSBHX0RFQ0xBUkVfRklOQUxfVFlQRSgpLgorKy8vIChJ dCB3YXMgZGVjbGFyZWQgYSBmaW5hbCB0eXBlIHNvbWV3aGVyZSBiZXR3ZWVuIDIuODkuMSBhbmQg Mi44OS4yLgorKy8vIFRoZSBjb21waWxlciB3aWxsIHByb2JhYmx5IGNvbXBsYWluIGlmIHlvdSBj b21waWxlIGFnYWluc3QgYSBnbGliIDIuODkuMQorKy8vIHdoZXJlIEdEQnVzQWN0aW9uR3JvdXAg aXMgbm90IGEgZmluYWwgdHlwZS4pCisrI2lmICFHTElCX0NIRUNLX1ZFUlNJT04oMiw4OSwxKQor K3VzaW5nIEdEQnVzQWN0aW9uR3JvdXBDbGFzcyA9IHN0cnVjdCBfR0RCdXNBY3Rpb25Hcm91cENs YXNzOworKyNlbmRpZgorKyNlbmRpZiAvKiBET1hZR0VOX1NIT1VMRF9TS0lQX1RISVMgKi8KKysK KyBuYW1lc3BhY2UgR2lvCisgeworIAorQEAgLTQzLDYgKzU0LDkgQEAgY2xhc3MgR0lPTU1fQVBJ IEFjdGlvbkdyb3VwCisgICBfQ0xBU1NfR09CSkVDVChBY3Rpb25Hcm91cCwgR0RCdXNBY3Rpb25H cm91cCwgR19EQlVTX0FDVElPTl9HUk9VUCwgR2xpYjo6T2JqZWN0LCBHT2JqZWN0LCAsICwgR0lP TU1fQVBJKQorICAgX0lNUExFTUVOVFNfSU5URVJGQUNFKDo6R2lvOjpBY3Rpb25Hcm91cCkKKyAg IF9JTVBMRU1FTlRTX0lOVEVSRkFDRShSZW1vdGVBY3Rpb25Hcm91cCkKKysgIF9ET19OT1RfREVS SVZFX0dUWVBFIGRubC8vIEdEQnVzQWN0aW9uR3JvdXAgaXMgYSBmaW5hbCB0eXBlIHNpbmNlIGds aWIgMi44OS4yCisrICBfQUJJX0FTX1dJVEhfREVSSVZFRF9HVFlQRSBkbmwvLyBSZW1vdmUgd2hl biB3ZSBjYW4gYnJlYWsgQUJJCisrICBfU1RSVUNUX05PVF9ISURERU4KKyAKKyBwcm90ZWN0ZWQ6 CisgICBfQ1RPUl9ERUZBVUxUCitkaWZmIC0tZ2l0IGEvZ2lvL3NyYy9lbWJsZW0uaGcgYi9naW8v c3JjL2VtYmxlbS5oZworaW5kZXggM2EwZDMzMTYuLjczN2ZmZjI0IDEwMDY0NAorLS0tIGEvZ2lv L3NyYy9lbWJsZW0uaGcKKysrKyBiL2dpby9zcmMvZW1ibGVtLmhnCitAQCAtMTYsNiArMTYsNyBA QAorIAorICNpbmNsdWRlIDxnbGlibW0vb2JqZWN0Lmg+CisgI2luY2x1ZGUgPGdpb21tL2ljb24u aD4KKysjaW5jbHVkZSA8Z2lvL2dpby5oPgorIAorIF9ERUZTKGdpb21tLGdpbykKKyBfUElOQ0xV REUoZ2xpYm1tL3ByaXZhdGUvb2JqZWN0X3AuaCkKK0BAIC00Miw2ICs0Myw5IEBAIGNsYXNzIEdJ T01NX0FQSSBFbWJsZW0KKyB7CisgICBfQ0xBU1NfR09CSkVDVChFbWJsZW0sIEdFbWJsZW0sIEdf RU1CTEVNLCBHbGliOjpPYmplY3QsIEdPYmplY3QsICwgLCBHSU9NTV9BUEkpCisgICBfSU1QTEVN RU5UU19JTlRFUkZBQ0UoSWNvbikKKysgIF9ET19OT1RfREVSSVZFX0dUWVBFIGRubC8vIEdFbWJs ZW0gaXMgYSBmaW5hbCB0eXBlIHNpbmNlIGdsaWIgMi44OS4yCisrICBfQUJJX0FTX1dJVEhfREVS SVZFRF9HVFlQRSBkbmwvLyBSZW1vdmUgd2hlbiB3ZSBjYW4gYnJlYWsgQUJJCisrICBfU1RSVUNU X05PVF9ISURERU4KKyAKKyBwcm90ZWN0ZWQ6CisgICAvKiogQ3JlYXRlcyBhIG5ldyBlbWJsZW0g Zm9yIEBhIGljb24uCistLSAKK0dpdExhYgorCitGcm9tIGIzNTNhOGIwYWZjMWFhNzhmM2VlYzU4 MjI5ZjAyYWNkOWZhYjZkM2UgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBLamVsbCBB aGxzdGVkdCA8a2plbGxhaGxzdGVkdEBnbWFpbC5jb20+CitEYXRlOiBNb24sIDYgSnVsIDIwMjYg MTI6MjM6NTcgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSF0gR2lvOjpEQnVzOjpBY3Rpb25Hcm91cDog SW1wcm92ZSB0aGUgdGVzdCB3aGV0aGVyCisgR0RCdXNBY3Rpb25Hcm91cCBpcyBmaW5hbAorCist LS0KKyBnaW8vc3JjL2RidXNhY3Rpb25ncm91cC5oZyB8IDE1ICsrKysrKysrLS0tLS0tLQorIDEg ZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1n aXQgYS9naW8vc3JjL2RidXNhY3Rpb25ncm91cC5oZyBiL2dpby9zcmMvZGJ1c2FjdGlvbmdyb3Vw LmhnCitpbmRleCAyNzM1OWJmZS4uNzc3ZThmZDcgMTAwNjQ0CistLS0gYS9naW8vc3JjL2RidXNh Y3Rpb25ncm91cC5oZworKysrIGIvZ2lvL3NyYy9kYnVzYWN0aW9uZ3JvdXAuaGcKK0BAIC0yMiwx MyArMjIsMTQgQEAgX0RFRlMoZ2lvbW0sZ2lvKQorIF9QSU5DTFVERShnbGlibW0vcHJpdmF0ZS9v YmplY3RfcC5oKQorIAorICNpZm5kZWYgRE9YWUdFTl9TSE9VTERfU0tJUF9USElTCistLy8gTmVj ZXNzYXJ5IGlmIGNvbXBpbGVkIGFnYWluc3QgZ2xpYiA8IDIuODkuMSwgd2hlcmUgR0RCdXNBY3Rp b25Hcm91cCBpcyBub3QKKy0vLyBhIGZpbmFsIHR5cGUsIGFuZCBHREJ1c0FjdGlvbkdyb3VwQ2xh c3MgaXMgbm90IGRlZmluZWQgYnkgR19ERUNMQVJFX0ZJTkFMX1RZUEUoKS4KKy0vLyAoSXQgd2Fz IGRlY2xhcmVkIGEgZmluYWwgdHlwZSBzb21ld2hlcmUgYmV0d2VlbiAyLjg5LjEgYW5kIDIuODku Mi4KKy0vLyBUaGUgY29tcGlsZXIgd2lsbCBwcm9iYWJseSBjb21wbGFpbiBpZiB5b3UgY29tcGls ZSBhZ2FpbnN0IGEgZ2xpYiAyLjg5LjEKKy0vLyB3aGVyZSBHREJ1c0FjdGlvbkdyb3VwIGlzIG5v dCBhIGZpbmFsIHR5cGUuKQorLSNpZiAhR0xJQl9DSEVDS19WRVJTSU9OKDIsODksMSkKKy11c2lu ZyBHREJ1c0FjdGlvbkdyb3VwQ2xhc3MgPSBzdHJ1Y3QgX0dEQnVzQWN0aW9uR3JvdXBDbGFzczsK KysvLyBHREJ1c0FjdGlvbkdyb3VwIHdhcyBkZWNsYXJlZCBhIGZpbmFsIHR5cGUgYmV0d2VlbiBH TGliIDIuODkuMSBhbmQgMi44OS4yLgorKy8vIEJlZm9yZSB0aGF0LCBHREJ1c0FjdGlvbkdyb3Vw Q2xhc3Mgd2FzIG5vdCBkZWNsYXJlZCBpbiBHTGliLgorKy8vIFRoZSBwcmVwcm9jZXNzb3IgbWFj cm8gR19EQlVTX0FDVElPTl9HUk9VUF9DTEFTUyB3YXMgZGVmaW5lZCwgdGhvdWdoLgorKyNpZiAh R0xJQl9DSEVDS19WRVJTSU9OKDIsODksMSkgfHwgKCFHTElCX0NIRUNLX1ZFUlNJT04oMiw4OSwy KSAmJiBkZWZpbmVkKEdfREJVU19BQ1RJT05fR1JPVVBfQ0xBU1MpKQorKyAgLy8gZ2xpYiA8IDIu ODkuMSBvciAoZ2xpYiA9PSAyLjg5LjEgYW5kIEdfREJVU19BQ1RJT05fR1JPVVBfQ0xBU1MgaXMg YSBwcmVwcm9jZXNzb3IgbWFjcm8pCisrICAvLyBHREJ1c0FjdGlvbkdyb3VwIGlzIG5vdCBhIGZp bmFsIHR5cGUsCisrICAvLyBHREJ1c0FjdGlvbkdyb3VwQ2xhc3MgaXMgbm90IGRlY2xhcmVkIGlu IEdMaWIuCisrICB1c2luZyBHREJ1c0FjdGlvbkdyb3VwQ2xhc3MgPSBzdHJ1Y3QgX0dEQnVzQWN0 aW9uR3JvdXBDbGFzczsKKyAjZW5kaWYKKyAjZW5kaWYgLyogRE9YWUdFTl9TSE9VTERfU0tJUF9U SElTICovCisgCistLSAKK0dpdExhYgorCg==