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: Jitka Plesnikova To: git-commits@fedoraproject.org Subject: [rpms/swig] rawhide: Fix compilation with R 4.6.0 which removed non-API macros (rhbz#2463423) Date: Wed, 03 Jun 2026 08:42:38 GMT Message-ID: <178047615864.1.4025180381914001285.rpms-swig-3b030026675a@fedoraproject.org> List-ID: X-Git-Repo: rpms/swig X-Git-Branch: rawhide X-Git-Rev: 3b030026675a05712cff196540436e8866f7ca27 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvc3dpZwpCcmFuY2gg OiByYXdoaWRlCkNvbW1pdCA6IDNiMDMwMDI2Njc1YTA1NzEyY2ZmMTk2NTQwNDM2ZTg4NjZmN2Nh MjcKQXV0aG9yIDogSml0a2EgUGxlc25pa292YSA8anBsZXNuaWtAcmVkaGF0LmNvbT4KRGF0ZSAg IDogMjAyNi0wNi0wM1QxMDo0MjoyOCswMjowMApTdGF0cyAgOiArMTMzLy0xIGluIDIgZmlsZShz KQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3N3aWcvYy8zYjAz MDAyNjY3NWEwNTcxMmNmZjE5NjU0MDQzNmU4ODY2ZjdjYTI3P2JyYW5jaD1yYXdoaWRlCgpMb2c6 CkZpeCBjb21waWxhdGlvbiB3aXRoIFIgNC42LjAgd2hpY2ggcmVtb3ZlZCBub24tQVBJIG1hY3Jv cyAocmhieiMyNDYzNDIzKQoKLS0tCmRpZmYgLS1naXQgYS9zd2lnLVItRml4LWNvbXBpbGF0aW9u LXdpdGgtUi00LjYuMC13aGljaC1yZW1vdmVkLW5vbi1BUEkucGF0Y2ggYi9zd2lnLVItRml4LWNv bXBpbGF0aW9uLXdpdGgtUi00LjYuMC13aGljaC1yZW1vdmVkLW5vbi1BUEkucGF0Y2gKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWI5YTk5OQotLS0gL2Rldi9udWxsCisrKyBi L3N3aWctUi1GaXgtY29tcGlsYXRpb24td2l0aC1SLTQuNi4wLXdoaWNoLXJlbW92ZWQtbm9uLUFQ SS5wYXRjaApAQCAtMCwwICsxLDEyNyBAQAorRnJvbSAwNjAxYjljYTk0MDFhZWQ1YmNmMWIwMThi ZTkyMmIxNWE4Y2VlOTJhIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogQnJhZGxleSBM b3dla2FtcCA8Ymxvd2VrYW1wQG1haWwubmloLmdvdj4KK0RhdGU6IFRodSwgMzAgQXByIDIwMjYg MTY6MDk6NTQgKzAwMDAKK1N1YmplY3Q6IFtQQVRDSF0gW1JdIEZpeCBjb21waWxhdGlvbiB3aXRo IFIgNC42LjAgd2hpY2ggcmVtb3ZlZCBub24tQVBJIG1hY3JvcworICMzNDA3CisKK1IgNC42LjAg KEFwcmlsIDIwMjUpIHJlbW92ZWQgdGhlIG5vbi1BUEkgbWFjcm8gU0VUX1M0X09CSkVDVCBhbmQg bWFkZQorQ0hBUkFDVEVSX1BPSU5URVIgcmV0dXJuIGEgY29uc3QgcG9pbnRlciwgYnJlYWtpbmcg Y29tcGlsYXRpb24gb2YgU1dJRworZ2VuZXJhdGVkIFIgY29kZS4KKworUmVwbGFjZSB3aXRoIHBy b3BlciBSIEFQSSBlcXVpdmFsZW50czoKKy0gU0VUX1M0X09CSkVDVCh4KSAtPiB4ID0gUmZfYXNT NCh4LCBUUlVFLCAwKSAgKDMgc2l0ZXMgaW4gcnJ1bi5zd2cpCistIENIQVJBQ1RFUl9QT0lOVEVS KHYpW2ldID0gLi4uIC0+IFNFVF9TVFJJTkdfRUxUKHYsIGksIC4uLikgICgyIHNpdGVzIGluIHN0 ZF92ZWN0b3IuaSkKKy0gQ0hBUkFDVEVSX1BPSU5URVIoKSB2aWEgcHN0ciAtPiBTVFJJTkdfRUxU KCwgaSkgZGlyZWN0bHkgIChhcmdjYXJndi5pKQorCitBbGwgcmVwbGFjZW1lbnQgQVBJcyBoYXZl IGJlZW4gYXZhaWxhYmxlIHNpbmNlIFIgMi54IHNvIG5vIHZlcnNpb24KK2d1YXJkcyBhcmUgcmVx dWlyZWQuCisKK0Fzc2lzdGVkLWJ5OiBHaXRIdWIgQ29waWxvdCAoQ2xhdWRlIFNvbm5ldCA0LjYp CistLS0KKyBDSEFOR0VTLmN1cnJlbnQgICAgfCA2ICsrKysrKworIExpYi9yL2FyZ2Nhcmd2Lmkg ICB8IDQgKy0tLQorIExpYi9yL3JydW4uc3dnICAgICB8IDYgKysrLS0tCisgTGliL3Ivc3RkX3Zl Y3Rvci5pIHwgNCArKy0tCisgNCBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA4IGRl bGV0aW9ucygtKQorCisjZGlmZiAtLWdpdCBhL0NIQU5HRVMuY3VycmVudCBiL0NIQU5HRVMuY3Vy cmVudAorI2luZGV4IGE5MmFmZjJmMi4uMjg3YTc5NWJhIDEwMDY0NAorIy0tLSBhL0NIQU5HRVMu Y3VycmVudAorIysrKyBiL0NIQU5HRVMuY3VycmVudAorI0BAIC03LDYgKzcsMTIgQEAgdGhlIGlz c3VlIG51bWJlciB0byB0aGUgZW5kIG9mIHRoZSBVUkw6IGh0dHBzOi8vZ2l0aHViLmNvbS9zd2ln L3N3aWcvaXNzdWVzLworIyBWZXJzaW9uIDQuNS4wIChpbiBwcm9ncmVzcykKKyMgPT09PT09PT09 PT09PT09PT09PT09PT09PT09CisjIAorIysyMDI2LTA1LTE1OiBibG93ZWthbXAKKyMrICAgICAg ICAgICAgW1JdICMzNDA3IEZpeCBjb21waWxhdGlvbiB3aXRoIFIgNC42LjAgd2hpY2ggcmVtb3Zl ZCB0aGUgbm9uLUFQSSBtYWNybworIysgICAgICAgICAgICBTRVRfUzRfT0JKRUNUIGFuZCBtYWRl IENIQVJBQ1RFUl9QT0lOVEVSIHJldHVybiBhIGNvbnN0IHBvaW50ZXIuCisjKyAgICAgICAgICAg IFVzZSBSZl9hc1M0LCBTRVRfU1RSSU5HX0VMVCBhbmQgU1RSSU5HX0VMVCBpbnN0ZWFkLiBUaGVz ZSByZXBsYWNlbWVudAorIysgICAgICAgICAgICBBUElzIGhhdmUgYmVlbiBhdmFpbGFibGUgc2lu Y2UgUiAyLnggc28gbm8gdmVyc2lvbiBndWFyZHMgYXJlIHJlcXVpcmVkLgorIysKKyMgMjAyNi0w NS0xMjogd3NmdWx0b24KKyMgICAgICAgICAgICAgQysrMjA6ICV0ZW1wbGF0ZSBjYW4gbm93IGlu c3RhbnRpYXRlIGFiYnJldmlhdGVkIGZ1bmN0aW9uIHRlbXBsYXRlcworIyAgICAgICAgICAgICB0 aGF0IG1peCAnYXV0bycgcGFyYW1ldGVycyB3aXRoIGEgdmFyaWFkaWMgZXhwbGljaXQgdGVtcGxh dGUgcGFjaywKK2RpZmYgLS1naXQgYS9MaWIvci9hcmdjYXJndi5pIGIvTGliL3IvYXJnY2FyZ3Yu aQoraW5kZXggNzMzODBmNGUyLi5hZjdhYTE0ZDYgMTAwNjQ0CistLS0gYS9MaWIvci9hcmdjYXJn di5pCisrKysgYi9MaWIvci9hcmdjYXJndi5pCitAQCAtMTQsNyArMTQsNiBAQAorICV9CisgJXR5 cGVtYXAoaW4pIChpbnQgQVJHQywgY2hhciAqKkFSR1YpIHsKKyAgICQxX2x0eXBlIGk7CistICBT RVhQICpwc3RyOworICAgaWYgKCRpbnB1dCA9PSBSX05pbFZhbHVlKSB7CisgICAgIC8qIEVtcHR5 IGFycmF5ICovCisgICAgICQxID0gMDsKK0BAIC0yMiwxNCArMjEsMTMgQEAKKyAgICAgU1dJR19l eGNlcHRpb25fZmFpbChTV0lHX1J1bnRpbWVFcnJvciwgIldyb25nIGFycmF5IHR5cGUuIik7Cisg ICB9IGVsc2UgeworICAgICAkMSA9IFJmX2xlbmd0aCgkaW5wdXQpOworLSAgICBwc3RyID0gQ0hB UkFDVEVSX1BPSU5URVIoJGlucHV0KTsKKyAgIH0KKyAgICQyID0gKCQyX2x0eXBlKSBtYWxsb2Mo KCQxKzEpKnNpemVvZigkKjJfbHR5cGUpKTsKKyAgIGlmICgkMiA9PSBOVUxMKSB7CisgICAgIFNX SUdfZXhjZXB0aW9uX2ZhaWwoU1dJR19NZW1vcnlFcnJvciwgIk1lbW9yeSBhbGxvY2F0aW9uIGZh aWxlZC4iKTsKKyAgIH0KKyAgIGZvciAoaSA9IDA7IGkgPCAkMTsgaSsrKSB7CistICAgICQyW2ld ID0gKCQqMl9sdHlwZSlTVFJJTkdfVkFMVUUocHN0cltpXSk7CisrICAgICQyW2ldID0gKCQqMl9s dHlwZSlTVFJJTkdfVkFMVUUoU1RSSU5HX0VMVCgkaW5wdXQsIGkpKTsKKyAgIH0KKyAgICQyW2ld ID0gTlVMTDsKKyB9CitkaWZmIC0tZ2l0IGEvTGliL3IvcnJ1bi5zd2cgYi9MaWIvci9ycnVuLnN3 ZworaW5kZXggNGMwM2Q1ODg0Li41ZGVlMzkxZjMgMTAwNjQ0CistLS0gYS9MaWIvci9ycnVuLnN3 ZworKysrIGIvTGliL3IvcnJ1bi5zd2cKK0BAIC0yNjcsNyArMjY3LDcgQEAgU1dJR19NYWtlUHRy KHZvaWQgKnB0ciwgY29uc3QgY2hhciAqdHlwZU5hbWUsIGludCBmbGFncykKKyAgICAgUl9SZWdp c3RlckNGaW5hbGl6ZXIoZXh0ZXJuYWwsIFJfU1dJR19SZWZlcmVuY2VGaW5hbGl6ZXIpOworIAor ICAgcl9vYmogPSBTRVRfU0xPVChyX29iaiwgUmZfbWtTdHJpbmcoKGNoYXIgKikgInJlZiIpLCBl eHRlcm5hbCk7CistICBTRVRfUzRfT0JKRUNUKHJfb2JqKTsKKysgIHJfb2JqID0gUmZfYXNTNChy X29iaiwgVFJVRSwgMCk7CisgICBSZl91bnByb3RlY3QoMik7CisgCisgICByZXR1cm4ocl9vYmop OworQEAgLTI4NSw3ICsyODUsNyBAQCBSX1NXSUdfY3JlYXRlX1NXSUdfUl9BcnJheShjb25zdCBj aGFyICp0eXBlTmFtZSwgU0VYUCByZWYsIGludCBsZW4pCisgICAgUmZfcHJvdGVjdChhcnIgPSBS X2RvX3Nsb3RfYXNzaWduKGFyciwgUmZfbWtTdHJpbmcoImRpbXMiKSwgUmZfU2NhbGFySW50ZWdl cihsZW4pKSk7CisgCisgICAgUmZfdW5wcm90ZWN0KDMpOyAJCQkgICAKKy0gICBTRVRfUzRfT0JK RUNUKGFycik7CQorKyAgIGFyciA9IFJmX2FzUzQoYXJyLCBUUlVFLCAwKTsKKyAgICByZXR1cm4g YXJyOworIH0KKyAKK0BAIC0zMDgsNyArMzA4LDcgQEAgU1dJR19SX05ld1BvaW50ZXJPYmoodm9p ZCAqcHRyLCBzd2lnX3R5cGVfaW5mbyAqdHlwZSwgaW50IGZsYWdzKSB7CisgICB9CisgICBycHRy ID0gUl9NYWtlRXh0ZXJuYWxQdHIocHRyLCAKKyAgIFJfTWFrZUV4dGVybmFsUHRyKHR5cGUsIFJf TmlsVmFsdWUsIFJfTmlsVmFsdWUpLCBSX05pbFZhbHVlKTsgCistICBTRVRfUzRfT0JKRUNUKHJw dHIpOworKyAgcnB0ciA9IFJmX2FzUzQocnB0ciwgVFJVRSwgMCk7CisgICByZXR1cm4gcnB0cjsK KyB9CisgCitkaWZmIC0tZ2l0IGEvTGliL3Ivc3RkX3ZlY3Rvci5pIGIvTGliL3Ivc3RkX3ZlY3Rv ci5pCitpbmRleCA2YjMyYzlmNmYuLjdkYjZkMzgxNCAxMDA2NDQKKy0tLSBhL0xpYi9yL3N0ZF92 ZWN0b3IuaQorKysrIGIvTGliL3Ivc3RkX3ZlY3Rvci5pCitAQCAtMjAzLDcgKzIwMyw3IEBACisg ICAgICAgICAgUFJPVEVDVChyZXN1bHQgPSBSZl9hbGxvY1ZlY3RvcihTVFJTWFAsIHZhbC0+c2l6 ZSgpKSk7CisgICAgICAgICAgZm9yICh1bnNpZ25lZCBwb3MgPSAwOyBwb3MgPCB2YWwtPnNpemUo KTsgcG9zKyspCisgICAgICAgICAgICB7CistICAgICAgICAgICAgIENIQVJBQ1RFUl9QT0lOVEVS KHJlc3VsdClbcG9zXSA9IFJmX21rQ2hhcigoKCp2YWwpW3Bvc10pLmNfc3RyKCkpOworKyAgICAg ICAgICAgICBTRVRfU1RSSU5HX0VMVChyZXN1bHQsIHBvcywgUmZfbWtDaGFyKCgoKnZhbClbcG9z XSkuY19zdHIoKSkpOworICAgICAgICAgICAgfQorICAgICAgICAgVU5QUk9URUNUKDEpOworICAg ICAgICAgcmV0dXJuKHJlc3VsdCk7CitAQCAtNjY5LDcgKzY2OSw3IEBACisgICAgICAgICAgICAg Ly8gRmlsbCB0aGUgUiB2ZWN0b3IKKyAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIHZwb3MgPSAw OyB2cG9zIDwgdmFsLT5hdChwb3MpLnNpemUoKTsgKyt2cG9zKQorICAgICAgICAgICAgICAgewor LSAgICAgICAgICAgICAgICBDSEFSQUNURVJfUE9JTlRFUihWRUNUT1JfRUxUKHJlc3VsdCwgcG9z KSlbdnBvc10gPSBSZl9ta0NoYXIodmFsLT5hdChwb3MpLmF0KHZwb3MpLmNfc3RyKCkpOworKyAg ICAgICAgICAgICAgICBTRVRfU1RSSU5HX0VMVChWRUNUT1JfRUxUKHJlc3VsdCwgcG9zKSwgdnBv cywgUmZfbWtDaGFyKHZhbC0+YXQocG9zKS5hdCh2cG9zKS5jX3N0cigpKSk7CisgICAgICAgICAg ICAgICB9CisgICAgICAgICAgIH0KKyAgICAgICAgIFVOUFJPVEVDVCgxKTsKKy0tIAorMi41NC4w CisKCmRpZmYgLS1naXQgYS9zd2lnLnNwZWMgYi9zd2lnLnNwZWMKaW5kZXggZjVmMDhhYS4uZGQ1 YmYxYSAxMDA2NDQKLS0tIGEvc3dpZy5zcGVjCisrKyBiL3N3aWcuc3BlYwpAQCAtNjksNyArNjks NyBAQAogU3VtbWFyeTogQ29ubmVjdHMgQy9DKysvT2JqZWN0aXZlIEMgdG8gc29tZSBoaWdoLWxl dmVsIHByb2dyYW1taW5nIGxhbmd1YWdlcwogTmFtZTogICAgc3dpZwogVmVyc2lvbjogNC40LjEK LVJlbGVhc2U6IDUlez9kaXN0fQorUmVsZWFzZTogNiV7P2Rpc3R9CiBMaWNlbnNlOiBHUEwtMy4w LW9yLWxhdGVyIEFORCBCU0QtMy1DbGF1c2UKIFVSTDogICAgIGh0dHBzOi8vd3d3LnN3aWcub3Jn LwogU291cmNlMDogaHR0cDovL2Rvd25sb2Fkcy5zb3VyY2Vmb3JnZS5uZXQvcHJvamVjdC9zd2ln L3N3aWcvc3dpZy0le3ZlcnNpb259L3N3aWctJXt2ZXJzaW9ufS50YXIuZ3oKQEAgLTgxLDYgKzgx LDggQEAgU291cmNlMzogY2NhY2hlLXN3aWcuc2gKIFNvdXJjZTQ6IGNjYWNoZS1zd2lnLmNzaAog JWVuZGlmCiAKK1BhdGNoMDogc3dpZy1SLUZpeC1jb21waWxhdGlvbi13aXRoLVItNC42LjAtd2hp Y2gtcmVtb3ZlZC1ub24tQVBJLnBhdGNoCisKIEJ1aWxkUmVxdWlyZXM6IGNvcmV1dGlscwogQnVp bGRSZXF1aXJlczogZmluZHV0aWxzCiBCdWlsZFJlcXVpcmVzOiBtYWtlCkBAIC0zOTgsNiArNDAw LDkgQEAgX0VPRgogJWVuZGlmCiAKICVjaGFuZ2Vsb2cKKyogVHVlIE1heSAyNiAyMDI2IEppdGth IFBsZXNuaWtvdmEgPGpwbGVzbmlrQHJlZGhhdC5jb20+IC0gNC40LjEtNgorLSBGaXggY29tcGls YXRpb24gd2l0aCBSIDQuNi4wIHdoaWNoIHJlbW92ZWQgbm9uLUFQSSBtYWNyb3MgKHJoYnojMjQ2 MzQyMykKKwogKiBGcmkgRmViIDI3IDIwMjYgT3Jpb24gUG9wbGF3c2tpIDxvcmlvbkBud3JhLmNv bT4gLSA0LjQuMS01CiAtIFJlYnVpbGQgZm9yIG9jdGF2ZSAxMS4xCiAK